From 514c025caf44998521e3fe4e754df143a175fa78 Mon Sep 17 00:00:00 2001
From: Chaos <chaos@nopj.cn>
Date: Mon, 10 Nov 2025 16:50:26 +0800
Subject: [PATCH] =?UTF-8?q?feat(network):=20=E6=B7=BB=E5=8A=A0=E7=BD=91?=
 =?UTF-8?q?=E7=BB=9C=E6=8E=A5=E5=8F=A3=E4=BF=A1=E6=81=AF=E8=8E=B7=E5=8F=96?=
 =?UTF-8?q?=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 新增 network-interface 依赖用于获取系统网络接口- 实现 Rust 端 get_network_interfaces 命令- 在 Svelte 前端调用 Tauri 命令并展示网络接口信息
- 添加接口信息表格展示及错误处理
- 更新布局结构移除多余注释和空行
---
 src-tauri/.idea/.gitignore      |  8 ++++
 src-tauri/.idea/modules.xml     |  8 ++++
 src-tauri/.idea/src-tauri.iml   | 11 +++++
 src-tauri/.idea/vcs.xml         |  6 +++
 src-tauri/Cargo.lock            | 13 ++++++
 src-tauri/Cargo.toml            |  3 +-
 src-tauri/src/lib.rs            |  5 ++
 src-tauri/src/main.rs           |  4 ++
 src-tauri/src/network.rs        | 37 +++++++++++++++
 src/routes/+layout.svelte       |  6 ---
 src/routes/iptools/+page.svelte | 82 ++++++++++++++++++++++++++++++---
 11 files changed, 169 insertions(+), 14 deletions(-)
 create mode 100644 src-tauri/.idea/.gitignore
 create mode 100644 src-tauri/.idea/modules.xml
 create mode 100644 src-tauri/.idea/src-tauri.iml
 create mode 100644 src-tauri/.idea/vcs.xml
 create mode 100644 src-tauri/src/network.rs

diff --git a/src-tauri/.idea/.gitignore b/src-tauri/.idea/.gitignore
new file mode 100644
index 0000000..35410ca
--- /dev/null
+++ b/src-tauri/.idea/.gitignore
@@ -0,0 +1,8 @@
+# 默认忽略的文件
+/shelf/
+/workspace.xml
+# 基于编辑器的 HTTP 客户端请求
+/httpRequests/
+# Datasource local storage ignored files
+/dataSources/
+/dataSources.local.xml
diff --git a/src-tauri/.idea/modules.xml b/src-tauri/.idea/modules.xml
new file mode 100644
index 0000000..4f536e1
--- /dev/null
+++ b/src-tauri/.idea/modules.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectModuleManager">
+    <modules>
+      <module fileurl="file://$PROJECT_DIR$/.idea/src-tauri.iml" filepath="$PROJECT_DIR$/.idea/src-tauri.iml" />
+    </modules>
+  </component>
+</project>
\ No newline at end of file
diff --git a/src-tauri/.idea/src-tauri.iml b/src-tauri/.idea/src-tauri.iml
new file mode 100644
index 0000000..cf84ae4
--- /dev/null
+++ b/src-tauri/.idea/src-tauri.iml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="EMPTY_MODULE" version="4">
+  <component name="NewModuleRootManager">
+    <content url="file://$MODULE_DIR$">
+      <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
+      <excludeFolder url="file://$MODULE_DIR$/target" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+  </component>
+</module>
\ No newline at end of file
diff --git a/src-tauri/.idea/vcs.xml b/src-tauri/.idea/vcs.xml
new file mode 100644
index 0000000..6c0b863
--- /dev/null
+++ b/src-tauri/.idea/vcs.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="VcsDirectoryMappings">
+    <mapping directory="$PROJECT_DIR$/.." vcs="Git" />
+  </component>
+</project>
\ No newline at end of file
diff --git a/src-tauri/Cargo.lock b/src-tauri/Cargo.lock
index dc964d5..24a1ada 100644
--- a/src-tauri/Cargo.lock
+++ b/src-tauri/Cargo.lock
@@ -80,6 +80,7 @@ name = "app"
 version = "0.1.0"
 dependencies = [
  "log",
+ "network-interface",
  "serde",
  "serde_json",
  "tauri",
@@ -1904,6 +1905,18 @@ dependencies = [
  "jni-sys",
 ]
 
+[[package]]
+name = "network-interface"
+version = "2.0.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "07709a6d4eba90ab10ec170a0530b3aafc81cb8a2d380e4423ae41fc55fe5745"
+dependencies = [
+ "cc",
+ "libc",
+ "thiserror 2.0.17",
+ "winapi",
+]
+
 [[package]]
 name = "new_debug_unreachable"
 version = "1.0.6"
diff --git a/src-tauri/Cargo.toml b/src-tauri/Cargo.toml
index 828960a..be87ba9 100644
--- a/src-tauri/Cargo.toml
+++ b/src-tauri/Cargo.toml
@@ -19,7 +19,8 @@ tauri-build = { version = "2.5.1", features = [] }
 
 [dependencies]
 serde_json = "1.0"
-serde = { version = "1.0", features = ["derive"] }
+serde = { version = "1.0.228" }
 log = "0.4"
 tauri = { version = "2.9.2", features = [] }
 tauri-plugin-log = "2"
+network-interface = "2.0.3"
diff --git a/src-tauri/src/lib.rs b/src-tauri/src/lib.rs
index 9c3118c..27dddf9 100644
--- a/src-tauri/src/lib.rs
+++ b/src-tauri/src/lib.rs
@@ -1,3 +1,5 @@
+mod network;
+
 #[cfg_attr(mobile, tauri::mobile_entry_point)]
 pub fn run() {
   tauri::Builder::default()
@@ -11,6 +13,9 @@ pub fn run() {
       }
       Ok(())
     })
+      .invoke_handler(tauri::generate_handler![
+            network::get_network_interfaces
+        ])
     .run(tauri::generate_context!())
     .expect("error while running tauri application");
 }
diff --git a/src-tauri/src/main.rs b/src-tauri/src/main.rs
index ad5fe83..d05668e 100644
--- a/src-tauri/src/main.rs
+++ b/src-tauri/src/main.rs
@@ -1,6 +1,10 @@
 // Prevents additional console window on Windows in release, DO NOT REMOVE!!
 #![cfg_attr(not(debug_assertions), windows_subsystem = "windows")]
 
+
+
+
+
 fn main() {
   app_lib::run();
 }
diff --git a/src-tauri/src/network.rs b/src-tauri/src/network.rs
new file mode 100644
index 0000000..9a71b44
--- /dev/null
+++ b/src-tauri/src/network.rs
@@ -0,0 +1,37 @@
+use network_interface::{NetworkInterface, NetworkInterfaceConfig};
+use serde::Serialize;
+
+#[derive(Debug, Serialize)]
+pub struct InterfaceInfo {
+    pub name: String,
+    pub addr: String, // IP 地址
+    pub mac: Option<String>, // MAC 地址，可能不存在
+}
+
+
+fn map_interface_to_info(interface: &NetworkInterface) -> InterfaceInfo {
+    let mac_address = interface.mac_addr.as_ref().map(|mac| mac.to_string());
+    let ip_addr = interface.addr.iter().find(|addr| addr.ip().is_ipv4())
+        .map(|addr| addr.ip().to_string())
+        .unwrap_or_else(|| "N/A".to_string());
+
+    InterfaceInfo {
+        name: interface.name.clone(),
+        addr: ip_addr,
+        mac: mac_address,
+    }
+}
+
+
+#[tauri::command]
+pub async fn get_network_interfaces() -> Result<Vec<InterfaceInfo>, String> {
+    match NetworkInterface::show() {
+        Ok(interfaces) => {
+            let info_list: Vec<InterfaceInfo> = interfaces.into_iter()
+                .map(|interface| map_interface_to_info(&interface))
+                .collect();
+            Ok(info_list)
+        }
+        Err(e) => Err(format!("无法获取网络接口信息: {}", e)),
+    }
+}
\ No newline at end of file
diff --git a/src/routes/+layout.svelte b/src/routes/+layout.svelte
index e0083bd..15f6121 100644
--- a/src/routes/+layout.svelte
+++ b/src/routes/+layout.svelte
@@ -15,14 +15,8 @@
 </svelte:head>
 <Header/>
 <div class="app-container">
-
-	<!-- 1. 侧边栏: 固定宽度，全高 -->
 	<Sidebar />
-	<!-- 2. 主内容区域: 占据剩余所有空间 (flex-1) -->
 	<main class="main-content">
-		<!-- 渲染子路由的内容 (+page.svelte 或下级 +layout.svelte)
-				 使用标准的 <slot /> 替换了 {@render children()} -->
-
 		{@render children()}
 	</main>
 </div>
diff --git a/src/routes/iptools/+page.svelte b/src/routes/iptools/+page.svelte
index 8495bb8..8729389 100644
--- a/src/routes/iptools/+page.svelte
+++ b/src/routes/iptools/+page.svelte
@@ -1,11 +1,79 @@
-<script>
+<script lang="ts">
+	import { invoke } from '@tauri-apps/api/core';
+	import { onMount } from 'svelte';
 
+	// 定义与 Rust 端 InterfaceInfo 匹配的 TypeScript 类型
+	interface InterfaceInfo {
+		name: string;
+		addr: string;
+		mac?: string;
+	}
+
+	let interfaces: InterfaceInfo[] = [];
+	let loading: boolean = true;
+	let error: string | null = null;
+
+	onMount(async () => {
+		try {
+			// 调用 Rust 后端命令
+			interfaces = await invoke<InterfaceInfo[]>("get_network_interfaces");
+			console.log("Network interfaces:", interfaces);
+		} catch (err) {
+			console.error("Failed to get network interfaces:", err);
+			// 错误处理，将错误信息展示给用户
+			error = (err as string) || "未知错误";
+		} finally {
+			loading = false;
+		}
+	});
 </script>
 
+<div class="network-info">
+	<h2>🌐 网络接口信息</h2>
+
+	{#if loading}
+		<p>正在加载...</p>
+	{:else if error}
+		<p class="error-message">错误: {error}</p>
+	{:else}
+		<table>
+			<thead>
+			<tr>
+				<th>名称</th>
+				<th>IP 地址 (IPv4)</th>
+				<th>MAC 地址</th>
+			</tr>
+			</thead>
+			<tbody>
+			{#each interfaces as iface (iface.name)}
+				<tr>
+					<td><strong>{iface.name}</strong></td>
+					<td>{iface.addr}</td>
+					<td>{iface.mac || 'N/A'}</td>
+				</tr>
+			{/each}
+			</tbody>
+		</table>
+	{/if}
+</div>
+
 <style>
-
-</style>
-
-<div>
-	IP 工具箱
-</div>
\ No newline at end of file
+    /* 简单的 Svelte 样式 */
+    table {
+        width: 100%;
+        border-collapse: collapse;
+        margin-top: 1em;
+    }
+    th, td {
+        border: 1px solid #ddd;
+        padding: 8px;
+        text-align: left;
+    }
+    th {
+        background-color: var(--main-bg-color);
+    }
+    .error-message {
+        color: red;
+        font-weight: bold;
+    }
+</style>
\ No newline at end of file