#Update 更新构建流程，更新所有包体，发布1.5.4

#Update 开机自启兼容配置改为win7 优化联机是否成功的判断方式

优化联机是否成功的判断方式

版本号更新->1.5.3

.gitignore

@@ -10,6 +10,7 @@ dist
 .idea
 .vscode
 release
+target
 
 src-tauri/easytier/logs
 src-tauri/easytier/tool/ResourcesExtract.exe

build.bat

@@ -1,12 +1,21 @@
+chcp 65001
 pnpm run build
-rustup default nightly
-@REM rem 使用rust nightly构建支持win7的版本，请先将根目录的windows.0.48.5 放入以下目录
-@REM rem C:\Program Files\Microsoft Visual Studio\2022\Community\VC\Tools\MSVC\你自己的版本\lib\x64
-@REM rem C:\Program Files\Microsoft Visual Studio\2022\Community\VC\Tools\MSVC\你自己的版本\lib\x86
-@REM rem C:\Program Files\Microsoft Visual Studio\2022\Community\VC\Tools\MSVC\你自己的版本\atlmfc\lib\x64
-@REM rem C:\Program Files\Microsoft Visual Studio\2022\Community\VC\Tools\MSVC\你自己的版本\atlmfc\lib\x86
-pnpm tauri build -- -Z  build-std --target x86_64-win7-windows-msvc
+@REM rustup default nightly
+
+@REM pnpm tauri build -- -Z  build-std --target x86_64-win7-windows-msvc
 rustup default stable
 pnpm tauri build
+
+@REM 复制文件夹src-tauri\easytier 到 src-tauri\target\release目录下 覆盖目录下同名目录
+xcopy /s /y /i src-tauri\easytier src-tauri\target\release\easytier
+@REM 复制 src-tauri\帮助.txt 和 src-tauri\uninstall.exe 到 src-tauri\target\release目录下 覆盖目录下同名文件
+xcopy /y src-tauri\帮助.txt src-tauri\target\release\帮助.txt
+xcopy /y src-tauri\uninstall.exe src-tauri\target\release\uninstall.exe
+@REM 复制文件夹src-tauri\easytier到 src-tauri\target\x86_64-win7-windows-msvc\release目录下 覆盖目录下同名目录
+@REM 复制 src-tauri\帮助.txt 和 src-tauri\uninstall.exe 到 src-tauri\target\x86_64-win7-windows-msvc\release目录下 覆盖目录下同名文件
+xcopy /y src-tauri\帮助.txt src-tauri\target\x86_64-win7-windows-msvc\release\帮助.txt
+xcopy /y src-tauri\uninstall.exe src-tauri\target\x86_64-win7-windows-msvc\release\uninstall.exe
+xcopy /s /y /i src-tauri\easytier src-tauri\target\x86_64-win7-windows-msvc\release\easytier
+
 pnpm run release
 pnpm run release-win7

composables/configJson.ts

@@ -7,7 +7,7 @@ import { bounce } from "~/utils";
 const b = bounce(600);
 export type ConfigServerUrlType = Array<string>;
 
-export const updateConfigJsonBounce = (configJsonSeverUrl?: ConfigServerUrlType) => {
+export const updateConfigJsonBounce = (configJsonSeverUrl?: ConfigServerUrlType | null) => {
 	b(async () => {
 		const mainStore = useMainStore();
 		if (mainStore.createConfigInEasytier) {
@@ -16,7 +16,7 @@ export const updateConfigJsonBounce = (configJsonSeverUrl?: ConfigServerUrlType)
 	});
 };
 
-export const updateConfigJson = async (configJsonSeverUrl?: ConfigServerUrlType) => {
+export const updateConfigJson = async (configJsonSeverUrl?: ConfigServerUrlType | null) => {
 	const mainStore = useMainStore();
 	const path = import.meta.env.VITE_CONFIG_FILE_NAME;
 	if (isNil(configJsonSeverUrl)) {
@@ -30,7 +30,6 @@ export const updateConfigJson = async (configJsonSeverUrl?: ConfigServerUrlType)
 		const {
 			proxyNetworks,
 			autoStart,
-			connectAfterStart,
 			saveErrorLog,
 			serverUrl,
 			enableCustomListener,
@@ -39,10 +38,6 @@ export const updateConfigJson = async (configJsonSeverUrl?: ConfigServerUrlType)
 			acceptDNS,
 			enablePortForward,
 			portForwardData,
-			tcpWhitelist,
-			udpWhitelist,
-			tcpWhitelistEnable,
-			udpWhitelistEnable,
 			...otherConfig
 		} = mainStore.config;
 		let writeServerUrl: Array<string> = serverUrl;

composables/server.ts

@@ -31,6 +31,12 @@ export const getServerArgs = () => {
 	if (networkSecret) {
 		args.push("--network-secret", networkSecret);
 	}
+	if (mainStore.serverConfig.ipv6PublicAddrProvider) {
+		args.push("--ipv6-public-addr-provider", "true");
+	}
+	if (mainStore.serverConfig.disableRelayData) {
+		args.push("--disable-relay-data", "true");
+	}
 
 	return args;
 };

package.json

@@ -3,7 +3,7 @@
 	"private": true,
 	"author": "leizi97",
 	"description": "A simple network initiator based on Easytier",
-	"version": "1.5.0",
+	"version": "1.5.4",
 	"scripts": {
 		"dev": "nuxt dev --dotenv env/.env.dev --host 0.0.0.0",
 		"build": "nuxt generate --dotenv env/.env.prod",
@@ -11,32 +11,35 @@
 		"release-win7": "node zip.js win7"
 	},
 	"devDependencies": {
-		"@element-plus/icons-vue": "^2.3.1",
+		"@element-plus/icons-vue": "2.3.2",
 		"@element-plus/nuxt": "1.1.4",
 		"@nuxtjs/tailwindcss": "6.13.2",
-		"@pinia/nuxt": "0.11.1",
-		"@tauri-apps/api": "2.7.0",
-		"@tauri-apps/cli": "2.7.1",
-		"@tauri-apps/plugin-cli": "2.4.0",
-		"@tauri-apps/plugin-clipboard-manager": "2.3.0",
-		"@tauri-apps/plugin-dialog": "2.3.1",
-		"@tauri-apps/plugin-fs": "2.4.1",
-		"@tauri-apps/plugin-log": "2.6.0",
-		"@tauri-apps/plugin-shell": "2.3.0",
-		"@tauri-apps/plugin-window-state": "2.4.0",
-		"@types/lodash-es": "^4.17.12",
-		"@vitejs/plugin-vue-jsx": "5.0.1",
+		"@oxc-minify/binding-win32-x64-msvc": "^0.107.0",
+		"@oxc-parser/binding-win32-x64-msvc": "^0.107.0",
+		"@oxc-transform/binding-win32-x64-msvc": "^0.107.0",
+		"@pinia/nuxt": "0.11.2",
+		"@tauri-apps/api": "2.11.0",
+		"@tauri-apps/cli": "2.11.1",
+		"@tauri-apps/plugin-cli": "2.4.1",
+		"@tauri-apps/plugin-clipboard-manager": "2.3.2",
+		"@tauri-apps/plugin-dialog": "2.7.1",
+		"@tauri-apps/plugin-fs": "2.5.1",
+		"@tauri-apps/plugin-log": "2.8.0",
+		"@tauri-apps/plugin-shell": "2.3.5",
+		"@tauri-apps/plugin-window-state": "2.4.1",
+		"@types/lodash-es": "4.17.12",
+		"@vitejs/plugin-vue-jsx": "5.1.1",
 		"@vueuse/core": "12.7.0",
-		"archiver": "^7.0.1",
-		"element-plus": "2.10.7",
+		"archiver": "7.0.1",
+		"element-plus": "2.13.0",
 		"less": "4.2.1",
-		"lodash-es": "^4.17.21",
-		"nuxt": "3.19.2",
-		"pinia": "3.0.3",
-		"pinia-plugin-persistedstate": "4.4.1",
-		"postcss": "^8.4.38",
-		"prettier": "3.6.2",
-		"prettier-plugin-tailwindcss": "0.6.14"
+		"lodash-es": "4.17.21",
+		"nuxt": "3.20.2",
+		"pinia": "3.0.4",
+		"pinia-plugin-persistedstate": "4.7.1",
+		"postcss": "8.4.49",
+		"prettier": "3.7.4",
+		"prettier-plugin-tailwindcss": "0.7.2"
 	},
 	"dependencies": {
 		"is-ip": "^5.0.1"

pages/advance.vue

@@ -37,6 +37,15 @@
 			</ElButton>
 		</div>
 		<div><ElCheckbox v-model="mainStore.config.enablePreventSleep">防止系统休眠(比如:屏幕会一直亮着)</ElCheckbox></div>
+		<div class="flex flex-nowrap items-center gap-[5px]">
+			<ElCheckbox v-model="mainStore.config.enableUdpBroadcastRelay">Windows UDP 广播中继</ElCheckbox>
+			<ElTooltip
+				content="开启后，虚拟网络内的其他设备可以接收到本机发出的 UDP 广播包，让依赖局域网广播的应用（如局域网游戏发现、DLNA 投屏）在虚拟网络中正常工作"
+			>
+				<ElIcon><QuestionFilled /></ElIcon>
+			</ElTooltip>
+			<CoreVersionWarning version="2.6.4" />
+		</div>
 		<div class="flex flex-nowrap items-center gap-[5px]">
 			<ElCheckbox v-model="mainStore.config.latencyfirst">使用低延迟模式</ElCheckbox>
 			<ElTooltip content="弱网环境下可能会导致网络延迟延迟忽高忽低">
@@ -98,14 +107,22 @@
 			<CoreVersionWarning version="2.3.1" />
 		</div>
 		<ElDivider />
-		<div class="flex w-full flex-nowrap items-center gap-[5px] mb-[3px]">
+		<div class="mb-[3px] flex w-full flex-nowrap items-center gap-[5px]">
 			<ElCheckbox v-model="mainStore.config.tcpWhitelistEnable">TCP端口白名单</ElCheckbox>
-			<ElInput class="flex-1" v-model="mainStore.config.tcpWhitelist" placeholder="支持单个端口（80）和范围（8000-9000）" />
+			<ElInput
+				class="flex-1"
+				v-model="mainStore.config.tcpWhitelist"
+				placeholder="支持单个端口（80）和范围（8000-9000）"
+			/>
 			<CoreVersionWarning version="2.4.2" />
 		</div>
 		<div class="flex w-full flex-nowrap items-center gap-[5px]">
 			<ElCheckbox v-model="mainStore.config.udpWhitelistEnable">UDP端口白名单</ElCheckbox>
-			<ElInput class="flex-1" v-model="mainStore.config.udpWhitelist" placeholder="支持单个端口（53）和范围（5000-6000）" />
+			<ElInput
+				class="flex-1"
+				v-model="mainStore.config.udpWhitelist"
+				placeholder="支持单个端口（53）和范围（5000-6000）"
+			/>
 			<CoreVersionWarning version="2.4.2" />
 		</div>
 		<div class="flex items-center gap-[10px]">
@@ -352,6 +369,35 @@
 				打开日志目录
 			</ElButton>
 		</div>
+		<ElDivider />
+		<div class="flex flex-nowrap items-center gap-[5px]">
+			<ElCheckbox v-model="mainStore.config.enableUpnp">UPnP 端口映射</ElCheckbox>
+			<ElTooltip content="自动向路由器请求端口映射，默认开启，启动时无需额外配置">
+				<ElIcon><QuestionFilled /></ElIcon>
+			</ElTooltip>
+			<CoreVersionWarning version="2.6.2" />
+		</div>
+		<div class="flex flex-nowrap items-center gap-[5px]">
+			<ElCheckbox v-model="mainStore.config.ipv6PublicAddrProvider">公网 IPv6 地址前缀提供</ElCheckbox>
+			<ElTooltip content="持有公网 IPv6 前缀的节点可开启，让同网络下其他节点自动获取独立公网地址">
+				<ElIcon><QuestionFilled /></ElIcon>
+			</ElTooltip>
+			<CoreVersionWarning version="2.6.2" />
+		</div>
+		<div class="flex flex-nowrap items-center gap-[5px]">
+			<ElCheckbox v-model="mainStore.config.ipv6PublicAddrAuto">公网 IPv6 地址自动获取</ElCheckbox>
+			<ElTooltip content="从持有公网 IPv6 前缀的提供者节点自动获取独立公网地址">
+				<ElIcon><QuestionFilled /></ElIcon>
+			</ElTooltip>
+			<CoreVersionWarning version="2.6.2" />
+		</div>
+		<div class="flex flex-nowrap items-center gap-[5px]">
+			<ElCheckbox v-model="mainStore.config.disableRelayData">禁用 Relay 数据转发</ElCheckbox>
+			<ElTooltip content="禁止节点转发 relay 数据流量而保留控制面功能，适用于不希望本节点承担中继带宽的场景">
+				<ElIcon><QuestionFilled /></ElIcon>
+			</ElTooltip>
+			<CoreVersionWarning version="2.6.3" />
+		</div>
 	</div>
 </template>
 <script setup lang="ts">

pages/cidr.vue

@@ -69,7 +69,7 @@
 		data.isRunning = true;
 		const [error, member] = await ATJ(invoke<string>("get_route_by_cli"));
 		data.isRunning = false;
-		// if(!member) return;
+		if(!member) return;
 		if (error) {
 			data.route = [];
 			return "";
@@ -79,16 +79,7 @@
 			await listenOutput();
 			return;
 		}
-		const routeInfo = parseCliInfo(member);
-		routeInfo.forEach(value => {
-			if (value.cost === "Local") {
-				value.cost = "本机";
-			}
-			if (value.ipv4 && value.ipv4.includes("/")) {
-				value.ipv4 = value.ipv4.split("/")[0];
-			}
-		});
-		data.route = routeInfo;
+		data.route = JSON.parse(member);
 	};
 
 	const listenStart = async () => {

pages/index.vue

@@ -67,6 +67,7 @@
 			</template>
 			<ElSelect
 				allow-create
+				:reserve-keyword="false"
 				filterable
 				multiple
 				collapse-tags
@@ -336,6 +337,12 @@
 								<ElDivider class="!m-0 !h-[2px]" />
 							</ElDropdownItem>
 							<ElDropdownItem
+								command="cidr"
+								:icon="Share"
+							>
+								子网代理
+							</ElDropdownItem>
+							<!-- <ElDropdownItem
 								command="import_config"
 								:icon="Link"
 							>
@@ -346,7 +353,7 @@
 								:icon="Share"
 							>
 								分享联机配置
-							</ElDropdownItem>
+							</ElDropdownItem> -->
 							<ElDropdownItem
 								command="reconnect"
 								:icon="RefreshRight"
@@ -405,21 +412,32 @@
 					开机自启
 				</ElCheckbox>
 			</ElTooltip>
-			<div>
-				<ElButton
-					@click="handleShowCidrDialog"
-					:icon="Share"
-					size="small"
+			<div class="flex items-center gap-[0_2px]">
+				<ElDropdown
+					@command="handleStartCommand"
+					trigger="click"
+					:show-arrow="false"
 				>
-					子网代理
-				</ElButton>
-				<ElButton
-					@click="handleShowAdvanceDialog"
-					:icon="Setting"
-					size="small"
-				>
-					高级选项
-				</ElButton>
+					<ElButton
+						:icon="Share"
+						size="small"
+					>
+						分享/导入
+					</ElButton>
+					<template #dropdown>
+						<el-dropdown-item command="share_config">分享联机配置</el-dropdown-item>
+						<el-dropdown-item command="import_config">导入联机配置</el-dropdown-item>
+					</template>
+				</ElDropdown>
+				<div>
+					<ElButton
+						@click="handleShowAdvanceDialog"
+						:icon="Setting"
+						size="small"
+					>
+						高级选项
+					</ElButton>
+				</div>
 			</div>
 			<div class="flex items-center gap-[0_5px]">
 				<div>
@@ -962,7 +980,7 @@
 		// console.log(mainStore.config.serverUrl);
 		for (const p of protocols) {
 			for (const url of mainStore.config.serverUrl) {
-				if (url.toLowerCase().startsWith(`${p}://`)) {
+				if (url.replace(/\\/g, "/").toLowerCase().startsWith(`${p}://`)) {
 					inputProtocols.push(p);
 				}
 			}
@@ -971,8 +989,8 @@
 			mainStore.config.protocol = uniq([...mainStore.config.protocol, ...inputProtocols]);
 			mainStore.config.serverUrl = (mainStore.config.serverUrl || []).map(url => {
 				for (const p of protocols) {
-					if (url.toLowerCase().startsWith(`${p}://`)) {
-						return url.slice(inputProtocols.length + 3);
+					if (url.replace(/\\/g, "/").toLowerCase().startsWith(`${p}://`)) {
+						return url.slice(p.length + 3);
 					}
 				}
 				return url;
@@ -981,6 +999,7 @@
 		mainStore.basePeers = uniq([...mainStore.config.serverUrl, ...mainStore.basePeers]);
 	};
 
+	let getMemeberTimer: number | null = null;
 	const listenObj: { [key: string]: any } = {
 		unListenOutPut: null,
 		unListenThreadId: null,
@@ -991,31 +1010,34 @@
 		server_thread_id: ref(null),
 		async listenOutput() {
 			// const appWindow = getCurrentWindow();
-			const unListen = await listen<string>("command-output", async event => {
-				data.isStart = true;
-				// console.error(event.payload);
-				if (event.payload) {
-					data.startLoading = false;
-					let ipv4 = /dhcp ip changed. old: None, new: Some\((\d+\.\d+\.\d+\.\d+).*\)/g.exec(event.payload as string)?.[1];
-					let devName = /tun device ready. dev: (.*)/g.exec(event.payload as string)?.[1];
-					if (mainStore.configStartEnable || mainStore.config.dhcp) {
-						let configIpv4 = /ipv4\s.*=\s.*[\'\"](\d+\.\d+\.\d+\.\d+).*[\'\"]/g.exec(event.payload as string)?.[1];
-						if (configIpv4) {
-							mainStore.config.ipv4 = configIpv4;
-						}
-					}
-					// if (event.payload.includes("peer connection removed")) {
-					// 	data.isSuccessGetIp = false;
-					// }
-					if (event.payload.includes("new peer connection added") && !data.isSuccessGetIp) {
+			getMemeberTimer && clearInterval(getMemeberTimer);
+			getMemeberTimer = setInterval(async () => {
+				const [error, member] = await ATJ(invoke<string>("get_members_by_cli"));
+				if(!data.isStart) {
+					getMemeberTimer && clearInterval(getMemeberTimer);
+					getMemeberTimer = null;
+					ipReset();
+					return;
+				}
+				if (!error && member !== "_EasytierGameCliFailedToConnect_") {
+					const memberJson = JSON.parse(member) as Member[];
+					const localData = memberJson.find(member => member?.cost == "Local");
+					const ipv4 = localData?.ipv4;
+					if (localData && ipv4) {
+						mainStore.config.ipv4 = ipv4;
 						await setTrayRunState(tray, true);
 						data.isSuccessGetIp = true;
 						await setTrayTooltip(tray, `IP: ${mainStore.config.ipv4}`);
+						return;
 					}
-					if (ipv4) {
-						mainStore.config.ipv4 = ipv4;
-						await setTrayTooltip(tray, `IP: ${ipv4}`);
-					}
+					ipReset();
+				}
+			}, 1000);
+			const unListen = await listen<string>("command-output", async event => {
+				data.isStart = true;
+				if (event.payload) {
+					data.startLoading = false;
+					let devName = /tun device ready. dev: (.*)/g.exec(event.payload as string)?.[1];
 					if (
 						devName &&
 						mainStore.config.enableNetCardMetric &&
@@ -1042,7 +1064,10 @@
 				data.log = logArr.slice(start).join("\n");
 				data.log += (event.payload as string) + "\n";
 			});
-			this.unListenOutPut = unListen;
+			this.unListenOutPut = () => {
+				getMemeberTimer && clearInterval(getMemeberTimer);
+				unListen();
+			};
 		},
 		async listenThreadId() {
 			const unListen = await listen("thread-id", event => {
@@ -1171,7 +1196,6 @@
 		);
 	};
 
-
 	let unlistenDownload: UnlistenFn | null = null;
 	let unlistenDownloadError: UnlistenFn | null = null;
 	let progress = ref<number>(0);
@@ -1385,154 +1409,12 @@
 		});
 	};
 
-	// 节点参数含义解析：
-	// - is_active: 节点是否激活运行
-	// - is_approved: 节点是否被管理员批准
-	// - allow_relay: 是否允许中继转发
-	// - current_health_status: 当前健康状态 ("healthy", "unhealthy", "unknown")
-	// - usage_percentage: 使用率百分比 (0-100)
-	// - health_percentage_24h: 24小时健康率 (0-100)
-	// - last_response_time: 最后响应时间(毫秒)，越小越好
-	// - current_connections: 当前连接数
-	// - max_connections: 最大连接数
-	// - protocol: 协议类型 ("tcp", "udp", "quic" 等)
-
-	const initNodesList = async () => {
-		let nodesList = await invoke<string>("fetch_nodes_list", { page: 1, limit: 1000 });
-		if (nodesList === "_EasytierGameFetchNodesError_") {
-			nodesList = "";
-		}
-		try {
-			const nodesListData: NodesResponse = JSON.parse(nodesList);
-			console.log("节点数据:", nodesListData);
-
-			if (nodesListData.success && nodesListData.data.items) {
-				// 过滤可用节点
-				const availableNodes = filterAvailableNodes(nodesListData.data.items);
-				console.log(`总节点数: ${nodesListData.data.items.length}, 可用节点数: ${availableNodes.length}`);
-
-				// 按优先级排序
-				const sortedNodes = sortNodesByPriority(availableNodes);
-
-				// 处理过滤后的节点数据
-				sortedNodes.forEach((node, index) => {
-					console.log(`${index + 1}. ${node.name} (${node.protocol}) - ${node.address}`);
-					console.log(
-						`   状态: ${node.current_health_status}, 使用率: ${node.usage_percentage.toFixed(1)}%, 响应时间: ${node.last_response_time}ms`
-					);
-					console.log(`   连接: ${node.current_connections}/${node.max_connections}, 24h健康率: ${node.health_percentage_24h}%`);
-				});
-
-				// 将可用节点添加到服务器列表
-				// addNodesToServerList(sortedNodes);
-			}
-		} catch (err) {
-			console.error("解析节点数据失败:", err);
-		}
-	};
-
-	// 过滤可用节点的函数
-	const filterAvailableNodes = (nodes: NodeItem[]): NodeItem[] => {
-		return nodes.filter(node => {
-			// 基本条件：节点必须激活且被批准
-			if (!node.is_active || !node.is_approved) {
-				return false;
-			}
-
-			// 健康状态检查
-			if (node.current_health_status !== "healthy") {
-				return false;
-			}
-
-			// 使用率检查：使用率不能超过95%
-			if (node.usage_percentage > 95) {
-				return false;
-			}
-
-			// 24小时健康率检查：必须大于90%
-			if (node.health_percentage_24h < 90) {
-				return false;
-			}
-
-			// 响应时间检查：响应时间不能超过60秒
-			if (node.last_response_time > 60000) {
-				return false;
-			}
-
-			// 连接数检查：当前连接数不能超过最大连接数的90%
-			if (node.current_connections > node.max_connections * 0.9) {
-				return false;
-			}
-
-			// 必须有有效的地址
-			if (!node.address || !node.host || !node.port) {
-				return false;
-			}
-
-			return true;
-		});
-	};
-
-	// 按优先级排序节点的函数
-	const sortNodesByPriority = (nodes: NodeItem[]): NodeItem[] => {
-		return nodes.sort((a, b) => {
-			// 优先级排序规则：
-			// 1. 响应时间越短越好
-			// 2. 使用率越低越好
-			// 3. 24小时健康率越高越好
-			// 4. 当前连接数越少越好
-
-			// 响应时间权重最高
-			const responseTimeDiff = a.last_response_time - b.last_response_time;
-			if (Math.abs(responseTimeDiff) > 1000) {
-				// 如果响应时间差异超过1秒
-				return responseTimeDiff;
-			}
-
-			// 使用率权重次之
-			const usageDiff = a.usage_percentage - b.usage_percentage;
-			if (Math.abs(usageDiff) > 5) {
-				// 如果使用率差异超过5%
-				return usageDiff;
-			}
-
-			// 24小时健康率
-			const healthDiff = b.health_percentage_24h - a.health_percentage_24h;
-			if (Math.abs(healthDiff) > 1) {
-				// 如果健康率差异超过1%
-				return healthDiff;
-			}
-
-			// 当前连接数
-			return a.current_connections - b.current_connections;
-		});
-	};
-
-	// 将节点添加到服务器列表的函数
-	const addNodesToServerList = (nodes: NodeItem[]) => {
-		// 提取服务器地址
-		const serverAddresses = nodes.map(node => node.address.replace(`${node.protocol}://`, ""));
-
-		// 去重并添加到基础服务器列表
-		const uniqueAddresses = uniq([...serverAddresses, ...mainStore.basePeers]);
-		mainStore.basePeers = uniqueAddresses;
-
-		// 如果当前没有选择服务器，自动选择第一个最佳节点
-		if (mainStore.config.serverUrl.length === 0 && serverAddresses.length > 0) {
-			mainStore.config.serverUrl = [serverAddresses[0]];
-			console.log(`自动选择最佳服务器: ${serverAddresses[0]}`);
-		}
-
-		console.log(`已添加 ${serverAddresses.length} 个可用服务器到列表`);
-	};
-
 	let logsTimer: number | null = null;
 	let serverLogsTimer: number | null = null;
 	let cidrTimer: number | null = null;
 
 	onMounted(async () => {
 		await compatibleInitServerUrl();
-		initNodesList();
 		await initGuiJson();
 		await compatibleInitAutoStart();
 		// await initAutoStart();
@@ -1552,7 +1434,6 @@
 			checkNewVersion();
 		}
 		await storageDialog();
-		
 	});
 
 	// storageEventEmitter.addEventListener("localStorageChange", () => {
@@ -1565,7 +1446,6 @@
 		return data.configJsonSeverUrl;
 	});
 
-
 	onBeforeUnmount(() => {
 		unListenAll();
 		listenObj.unListenReleaseList && listenObj.unListenReleaseList();
@@ -1575,7 +1455,6 @@
 		cidrTimer && clearInterval(cidrTimer);
 		stopPreventSleep();
 		// unListenStorage && unListenStorage();
-		
 	});
 
 	const getArgs = async () => {
@@ -1646,7 +1525,7 @@
 			args.push("--disable-p2p");
 		}
 		if (mainStore.config.disableIpv6) {
-			args.push("--disable-ipv6");
+			args.push("--disable-ipv6", "true");
 		}
 		if (mainStore.config.disbleListenner) {
 			args.push("--no-listener");
@@ -1673,33 +1552,35 @@
 					return /^\d+\.\d+\.\d+\.\d+\/\d+$/g.test(cidr);
 				});
 			if (newformatProxyNetworks.length > 0) {
-				args.push("--proxy-networks", ...newformatProxyNetworks);
+				for(const cidr of newformatProxyNetworks) {
+					args.push("-n", cidr);
+				}
 			}
 			mainStore.config.proxyNetworks = formatProxyNetworks.join("\n");
 		}
 		if (mainStore.config.disableEncryption) {
-			args.push("--disable-encryption");
+			args.push("--disable-encryption", "true");
 		}
 		if (mainStore.config.multiThread) {
-			args.push("--multi-thread");
+			args.push("--multi-thread", "true");
 		}
 		if (mainStore.config.enablExitNode) {
-			args.push("--enable-exit-node");
+			args.push("--enable-exit-node", "true");
 		}
 		if (mainStore.config.noTun) {
-			args.push("--no-tun");
+			args.push("--no-tun", "true");
 		}
 		if (mainStore.config.latencyfirst) {
-			args.push("--latency-first");
+			args.push("--latency-first", "true");
 		}
 		if (mainStore.config.useSmoltcp) {
-			args.push("--use-smoltcp");
+			args.push("--use-smoltcp", "true");
 		}
 		if (mainStore.config.disableUdpHolePunching) {
-			args.push("--disable-udp-hole-punching");
+			args.push("--disable-udp-hole-punching", "true");
 		}
 		if (mainStore.config.relayAllPeerrpc) {
-			args.push("--relay-all-peer-rpc");
+			args.push("--relay-all-peer-rpc", "true");
 		}
 		if (mainStore.config.saveErrorLog) {
 			args.push("--file-log-level", mainStore.config.logLevel, "--file-log-dir", import.meta.env.VITE_LOG_PATH);
@@ -1722,11 +1603,26 @@
 		if (mainStore.config.disableQuicInput) {
 			args.push("--disable-quic-input", "true");
 		}
+		if (mainStore.config.enableUdpBroadcastRelay) {
+			args.push("--enable-udp-broadcast-relay", "true");
+		}
+		if (!mainStore.config.enableUpnp) {
+			args.push("--disable-upnp", "true");
+		}
+		if (mainStore.config.ipv6PublicAddrProvider) {
+			args.push("--ipv6-public-addr-provider", "true");
+		}
+		if (mainStore.config.ipv6PublicAddrAuto) {
+			args.push("--ipv6-public-addr-auto", "true");
+		}
+		if (mainStore.config.disableRelayData) {
+			args.push("--disable-relay-data", "true");
+		}
 		if (mainStore.config.bindDeviceEnable) {
 			args.push("--bind-device", "true");
 		}
 		if (mainStore.proxyForwardBySystem) {
-			args.push("--proxy-forward-by-system");
+			args.push("--proxy-forward-by-system", "true");
 		}
 		if (mainStore.config.acceptDNS) {
 			args.push("--accept-dns", "true");
@@ -1757,12 +1653,17 @@
 		return args;
 	};
 
-	const reset = async () => {
-		data.isStart = false;
+	const ipReset = async () => {
 		data.isSuccessGetIp = false;
 		if (mainStore.config.dhcp) {
 			mainStore.config.ipv4 = "";
 		}
+		await setTrayRunState(tray, false);
+		await setTrayTooltip(tray);
+	};
+
+	const reset = async () => {
+		data.isStart = false;
 		const memberDialog = await getAllWebviewWindows();
 		const memberDialogs = memberDialog.filter(item => item.label === "member");
 		if (memberDialogs && memberDialogs.length > 0) {
@@ -1774,9 +1675,8 @@
 				}
 			}
 		}
-		await setTrayRunState(tray, false);
-		await setTrayTooltip(tray);
 		await unListenAll();
+		await ipReset();
 	};
 
 	const handleConnection = async () => {
@@ -1925,6 +1825,9 @@
 		if (command === "create_server") {
 			await handleShowServerDialog();
 		}
+		if (command === "cidr") {
+			await handleShowCidrDialog();
+		}
 		if (command === "config_admin") {
 			configAdminData.visible = true;
 			const path = import.meta.env.VITE_CONFIG_ADMIN_PATH;
@@ -2140,7 +2043,7 @@
 
 	const handleShowMemberDialog = async () => {
 		if (!data.isStart) {
-			return ElMessage.warning("请先开始联机");
+			return ElMessage.warning("请先启动联机");
 		}
 		// if (!mainStore.config.ipv4) {
 		// 	return ElMessage.warning("请等待获取IP");

pages/member.vue

@@ -1,6 +1,6 @@
 <template>
 	<div class="h-full overflow-auto">
-		<div class="w-[1200px]">
+		<div class="max-w-[2000px]">
 			<ElText
 				size="small"
 				v-if="!data.member || data.member.length <= 0"
@@ -10,26 +10,41 @@
 			<ElTable
 				stripe
 				border
-				:data="data.member"
+				:data="computedMember"
 				v-else
 			>
 				<ElTableColumn
 					sortable
-					width="140"
 					label="成员名"
 					prop="hostname"
 				>
 					<template #default="{ row }">
-						{{
-							(row.hostname || "").toLowerCase().includes("publicserver")
-								? (row.hostname || "").replace("PublicServer", "服务器")
-								: row.hostname || "-"
-						}}
+						<div :class="`whitespace-pre-wrap`">
+							<div>
+								{{
+									(row.hostname || "").toLowerCase().includes("publicserver")
+										? (row.hostname || "").replace("PublicServer", "服务器")
+										: row.hostname || "-"
+								}}
+							</div>
+							<div
+								class="space-y-1"
+								v-if="row?.connections_addrs?.length > 0"
+							>
+								<ElTag
+									:key="url"
+									v-for="url in row.connections_addrs"
+									class="!flex !h-auto !whitespace-pre-wrap !break-all !py-[5px]"
+								>
+									{{ url }}
+								</ElTag>
+							</div>
+						</div>
 					</template>
 				</ElTableColumn>
 				<ElTableColumn
 					sortable
-					width="90"
+					width="70"
 					prop="cost"
 					label="方式"
 				>
@@ -50,11 +65,29 @@
 					label="虚拟网IP"
 					:sort-method="sortIpv4"
 					:sort-orders="['ascending', 'descending', null]"
-				></ElTableColumn>
+				>
+					<template #default="{ row }">
+						<div class="space-y-[5px]">
+							<div>
+								{{ row.ipv4 || "-" }}
+							</div>
+							<div v-if="row.proxy?.[0]">
+								<ElTooltip :content="row.proxy?.[1] == 'Connected' ? '已连接' : '已断开'">
+									<ElTag
+										size="small"
+										:type="row.proxy?.[1] == 'Connected' ? 'success' : 'danger'"
+									>
+										{{ row.proxy?.[0] || "-" }}代理
+									</ElTag>
+								</ElTooltip>
+							</div>
+						</div>
+					</template>
+				</ElTableColumn>
 				<ElTableColumn
 					sortable
 					prop="lat_ms"
-					width="100"
+					width="80"
 					label="延迟/ms"
 					:sort-method="sortLatMs"
 					:sort-orders="['ascending', 'descending', null]"
@@ -65,7 +98,7 @@
 				</ElTableColumn>
 				<ElTableColumn
 					sortable
-					width="100"
+					width="70"
 					prop="loss_rate"
 					label="丢包率"
 				>
@@ -81,12 +114,12 @@
 				</ElTableColumn>
 				<ElTableColumn
 					sortable
-					width="110"
+					width="100"
 					label="NAT类型"
 					prop="nat_type"
 				>
 					<template #default="{ row }">
-						{{ natMaps[row.nat_type.toLowerCase() as natKyes] || row.nat_type || "-" }}
+						{{ natMaps[row.nat_type.toLowerCase() as NATKyes] || row.nat_type || "-" }}
 					</template>
 				</ElTableColumn>
 				<ElTableColumn
@@ -113,7 +146,7 @@
 					sortable
 					prop="tx_bytes"
 					label="传输"
-					:sort-method="(a, b) => sortBytes(a, b, 'tx_bytes')"
+					:sort-method="(a: any, b: any) => sortBytes(a, b, 'tx_bytes')"
 					:sort-orders="['ascending', 'descending', null]"
 				></ElTableColumn>
 			</ElTable>
@@ -122,24 +155,12 @@
 </template>
 <script setup lang="ts">
 	import { invoke } from "@tauri-apps/api/core";
-	import { reactive, onMounted, onBeforeUnmount } from "vue";
-	import { ATJ, parseCliInfo } from "@/utils";
+	import { reactive, onMounted, onBeforeUnmount, computed } from "vue";
+	import { ATJ } from "@/utils";
 	import { ElConfirmDanger } from "~/utils/element";
 	import { getCurrentWindow } from "@tauri-apps/api/window";
-	import { endsWith, isNaN } from "lodash-es";
-	// 	enum NatType {
-	//   // has NAT; but own a single public IP, port is not changed
-	//   Unknown = 0;
-	//   OpenInternet = 1;
-	//   NoPAT = 2;
-	//   FullCone = 3;
-	//   Restricted = 4;
-	//   PortRestricted = 5;
-	//   Symmetric = 6;
-	//   SymUdpFirewall = 7;
-	//   SymmetricEasyInc = 8;
-	//   SymmetricEasyDec = 9;
-	// }
+	import { isNaN } from "lodash-es";
+
 	const natMaps = {
 		unknown: "未知",
 		OpenInternet: "nat0-openinternet",
@@ -152,15 +173,32 @@
 		symmetriceasyinc: "nat4-easyinc",
 		symUdpfirewall: "nat4-udpfirewall"
 	};
-	type natKyes = keyof typeof natMaps;
 
-	const data = reactive<{ member: { hostname: string; cost: string; ipv4: string; lat_msg: string; loss_rate: string; nat_type: string }[] }>({
-		member: []
+	type NATKyes = keyof typeof natMaps;
+
+	const data = reactive<{ member: Member[]; proxy: Proxy[] }>({
+		member: [],
+		proxy: []
+	});
+
+	const computedMember = computed(() => {
+		const localMember = data.member.find(member => member?.cost == "Local");
+		if (!localMember) return data.member;
+		const ipv4 = localMember.ipv4;
+		const proxyMember = data.proxy?.filter(proxy => proxy.src.startsWith(`${ipv4}:`));
+		const proxyObj: Record<string, [string, "Connected" | "Closed"]> = {};
+		for (const proxy of proxyMember) {
+			proxyObj[proxy.dst.split(":")[0]] = [proxy.transport_type, proxy.state];
+		}
+		return data.member.map(m => {
+			m.proxy = proxyObj?.[m.ipv4.split(":")?.[0]] || m?.proxy || ["", "Closed"];
+			return m;
+		});
 	});
 
 	// 延迟排序函数
-	const sortLatMs = (a: any, b: any): number => {
-		const getLatencyValue = (row: any): number => {
+	const sortLatMs = (a: Member, b: Member): number => {
+		const getLatencyValue = (row: Member): number => {
 			const latMs = row.lat_ms;
 
 			if (latMs === null || latMs === undefined || latMs === "") {
@@ -298,19 +336,6 @@
 		return num.toFixed(0);
 	};
 
-	const _showTableHeader = [
-		["hostname", "主机名"],
-		["cost", "路由"],
-		["ipv4", "虚拟网IP"],
-		["lat_ms", "延迟/ms"],
-		["loss_rate", "丢包率"],
-		["nat_type", "NAT类型"],
-		["version", "版本"],
-		["tunnel_proto", "隧道协议"],
-		["rx_bytes", "接收"],
-		["tx_bytes", "传输"]
-	];
-
 	let timer: number | null = null;
 
 	const listenOutput = async () => {
@@ -334,21 +359,44 @@
 			}
 			return;
 		}
-		// const peerInfo = parseCliInfo(member);
-		// peerInfo.forEach(value => {
-		// 	if (value.cost === "Local") {
-		// 		value.cost = "本机";
-		// 	}
-		// 	if (value.ipv4 && value.ipv4.includes("/")) {
-		// 		value.ipv4 = value.ipv4.split("/")[0];
-		// 	}
-		// });
-		// data.member = peerInfo;
+		const [errorConnections, connections] = await ATJ(invoke<string>("get_members_connections_cli"));
+		const memberConnections: ConnectionsType[] = JSON.parse(connections) as ConnectionsType[];
 
-		data.member = JSON.parse(member);
+		if (errorConnections != "_EasytierGameCliFailedToGetConnections_") {
+			data.member = (JSON.parse(member) as Member[]).map(member => {
+				const connection = memberConnections.find(conn => String(conn.route.peer_id) === member.id);
+				if (connection) {
+					member.connections_addrs = connection?.peer?.conns?.map(conn => conn?.tunnel?.remote_addr?.url || "") || [];
+				} else {
+					member.connections_addrs = [];
+				}
+				return member;
+			});
+		} else {
+			data.member = JSON.parse(member) as Member[];
+		}
+		// console.log(data.member);
+		getMembersProxy();
 		startTimer();
 	};
 
+	const getMembersProxy = async () => {
+		const [error, proxy] = await ATJ(invoke<string>("get_members_proxy"));
+		if (error) {
+			data.proxy = [];
+			return "";
+		}
+		if (proxy === "_EasytierGameCliFailedToGetProxy_") {
+			data.proxy = [];
+			return "";
+		}
+		try {
+			data.proxy = JSON.parse(proxy) as Proxy[];
+		} catch (error) {
+			data.proxy = [];
+		}
+	};
+
 	const startTimer = () => {
 		timer && clearTimeout(timer);
 		timer = setTimeout(() => {

pages/nodesList.vue

@@ -1,46 +1,53 @@
 <template>
 	<div class="relative flex h-full flex-col flex-wrap gap-[0] overflow-hidden">
-		<div class="flex h-[40px] w-full flex-nowrap items-center gap-[0_5px]">
-			<div class="ml-[5px] mr-auto flex flex-1">
+		<div class="flex h-[40px] w-full flex-nowrap items-center gap-[0_8px]">
+			<div class="ml-[5px] mr-auto flex">
 				<ElText class="text-lg font-semibold">公共服务器节点列表</ElText>
 			</div>
-			<div>
-				<ElButton
-					:loading="loading"
-					size="small"
-					type="primary"
-					class="mr-[5px]"
-					@click="refreshNodes"
-				>
-					刷新
-				</ElButton>
-				<ElButton
-					:disabled="selectedNodes.length === 0"
-					size="small"
-					type="success"
-					class="mr-[5px]"
-					@click="addSelectedToServerList"
-				>
-					添加选中 ({{ selectedNodes.length }})
-				</ElButton>
-				<ElTag
-					v-if="lastUpdateTime"
-					size="small"
-					type="info"
-				>
-					最后更新: {{ lastUpdateTime }}
-				</ElTag>
+			<div class="flex w-fit flex-nowrap items-center gap-[0_8px]">
+				<div>
+					<ElInput
+						placeholder="搜索名称/地址"
+						v-model="searchName"
+						clearable
+					></ElInput>
+				</div>
+				<div>
+					<ElButton
+						size="small"
+						type="primary"
+						@click="refreshNodes"
+					>
+						刷新
+					</ElButton>
+					<ElButton
+						:disabled="selectedNodes.length === 0"
+						size="small"
+						type="success"
+						class="mr-[8px]"
+						@click="addSelectedToServerList"
+					>
+						添加选中 ({{ selectedNodes.length }})
+					</ElButton>
+					<ElTag
+						size="small"
+						type="info"
+					>
+						最后更新: {{ lastUpdateTime || "00:00:00" }}
+					</ElTag>
+				</div>
 			</div>
 		</div>
 		<div class="flex w-full flex-1 flex-wrap gap-[0] overflow-auto">
 			<ElTable
-				:data="nodes"
+				:data="computedNodes"
 				stripe
 				height="100%"
 				ref="tableRef"
 				:empty-text="loading ? '加载中...' : '暂无可用服务器'"
 				:default-sort="{ prop: 'last_response_time', order: 'ascending' }"
-				@selection-change="handleSelectionChange"
+				@select-all="handleSelectChange"
+				@select="handleSelectChange"
 				@row-click="handleRowClick"
 			>
 				<ElTableColumn
@@ -87,7 +94,7 @@
 							:type="getResponseTimeType(row.last_response_time)"
 							size="small"
 						>
-							{{ row.last_response_time }}ms
+							{{ Number(row.last_response_time / 1000).toFixed(2) }}ms
 						</ElTag>
 					</template>
 				</ElTableColumn>
@@ -136,7 +143,6 @@
 				<ElTableColumn
 					prop="description"
 					label="描述"
-					width="300"
 					sortable
 				>
 					<template #default="{ row }">
@@ -151,10 +157,11 @@
 <script setup lang="ts">
 	import useMainStore from "@/stores/index";
 	import { invoke } from "@tauri-apps/api/core";
-	import { reactive, onMounted, onBeforeUnmount, ref, useTemplateRef } from "vue";
+	import { reactive, onMounted, onBeforeUnmount, ref, useTemplateRef, computed, nextTick } from "vue";
 	import { ElMessage, type TableInstance } from "element-plus";
 	import { dataSubscribe } from "~/composables/windows";
-import { uniq } from "lodash-es";
+	import { inputBounceRef } from "@/utils";
+	import { uniq } from "lodash-es";
 
 	const mainStore = useMainStore();
 	// 节点数据
@@ -162,6 +169,21 @@ import { uniq } from "lodash-es";
 	const loading = ref(false);
 	const lastUpdateTime = ref("");
 	const selectedNodes = ref<NodeItem[]>([]);
+	const searchName = ref<string>("");
+	const computedNodes = computed(() => {
+		const v = searchName.value.trim();
+		let result = nodes;
+		if (v) {
+			result = nodes.filter(node => node.name.includes(v) || node.address.includes(v));
+		}
+		nextTick(() => {
+			for (const node of selectedNodes.value) {
+				const nodeItem = nodes?.find(n => n.id === node.id);
+				tableRef.value?.toggleRowSelection(nodeItem, true);
+			}
+		});
+		return result;
+	});
 	const tableRef = useTemplateRef<TableInstance>("tableRef");
 
 	// 定时器
@@ -176,8 +198,8 @@ import { uniq } from "lodash-es";
 
 	// 获取响应时间类型
 	const getResponseTimeType = (responseTime: number) => {
-		if (responseTime < 1000) return "success";
-		if (responseTime < 5000) return "warning";
+		if (responseTime < 60 * 1000) return "success";
+		if (responseTime < 100 * 1000) return "warning";
 		return "danger";
 	};
 
@@ -191,14 +213,15 @@ import { uniq } from "lodash-es";
 	// 刷新节点数据
 	const refreshNodes = async () => {
 		loading.value = true;
+		let nodesList = await invoke<string>("fetch_nodes_list", { page: 1, limit: 1000 });
 		try {
-			let nodesList = await invoke<string>("fetch_nodes_list", { page: 1, limit: 1000 });
 			if (nodesList === "_EasytierGameFetchNodesError_") {
 				nodesList = "";
+				return;
 			}
-
 			if (nodesList) {
 				const nodesListData: NodesResponse = JSON.parse(nodesList);
+				// console.log(nodesListData);
 				if (nodesListData.success && nodesListData.data.items) {
 					// 过滤可用节点
 					const availableNodes = filterAvailableNodes(nodesListData.data.items);
@@ -215,6 +238,7 @@ import { uniq } from "lodash-es";
 				}
 			}
 		} catch (err) {
+			console.log(nodesList);
 			console.error("获取节点数据失败:", err);
 			ElMessage.error("获取节点数据失败");
 		} finally {
@@ -303,7 +327,7 @@ import { uniq } from "lodash-es";
 	const startRefreshTimer = () => {
 		refreshTimer = setInterval(() => {
 			refreshNodes();
-		}, 10000); // 10秒刷新一次
+		}, 60000); // 10秒刷新一次
 	};
 
 	// 停止定时器
@@ -315,12 +339,13 @@ import { uniq } from "lodash-es";
 	};
 
 	// 处理选择变化
-	const handleSelectionChange = (selection: NodeItem[]) => {
+	const handleSelectChange = (selection: NodeItem[]) => {
 		selectedNodes.value = selection;
 	};
 
 	const handleRowClick = (row: NodeItem) => {
 		tableRef.value?.toggleRowSelection(row);
+		selectedNodes.value = tableRef.value?.getSelectionRows() || [];
 	};
 
 	// 添加选中的服务器到主页面服务器列表

pages/server.vue

@@ -44,6 +44,18 @@
 							>
 								<ElCheckbox v-model="mainStore.serverConfig.relayAllPeerrpc">转发所有对等节点的RPC数据包</ElCheckbox>
 							</ElTooltip>
+							<ElTooltip
+								placement="top"
+								content="持有公网 IPv6 前缀时开启，让同网络下其他节点自动获取独立公网地址"
+							>
+								<ElCheckbox v-model="mainStore.serverConfig.ipv6PublicAddrProvider">公网IPv6地址前缀提供</ElCheckbox>
+							</ElTooltip>
+							<ElTooltip
+								placement="top"
+								content="禁止节点转发 relay 数据流量而保留控制面功能，适用于不希望本节点承担中继带宽的场景"
+							>
+								<ElCheckbox v-model="mainStore.serverConfig.disableRelayData">禁用Relay数据转发</ElCheckbox>
+							</ElTooltip>
 						</div>
 					</div>
 				</template>

server/tsconfig.json

@@ -1,3 +0,0 @@
-{
-  "extends": "../.nuxt/tsconfig.server.json"
-}

src-tauri/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "easytier-game"
-version = "1.5.0"
+version = "1.5.4"
 homepage = "https://github.com/EasyTier/EasyTier"
 repository = "https://github.com/EasyTier/EasytierGame"
 description = "A simple network initiator based on Easytier"
@@ -18,7 +18,7 @@ name = "app_lib"
 crate-type = ["staticlib", "cdylib", "rlib"]
 
 [build-dependencies]
-tauri-build = { version = "2.3.1", features = [] }
+tauri-build = { version = "2.6.1", features = [] }
 # prost-build = "0.13.2"
 
 [target.x86_64-pc-windows-msvc.build-dependencies]
@@ -28,24 +28,24 @@ thunk-rs = { git = "https://github.com/easytier/thunk.git", default-features = f
 serde_json = "1.0.137"
 serde = { version = "1.0.217", features = ["derive"] }
 log = "0.4.26"
-tauri = { version = "2.7.0", features = [ "protocol-asset",
+tauri = { version = "2.11.1", features = [ "protocol-asset",
     "tray-icon",
     "image-png",
     "image-ico"
 ] }
 
-tauri-plugin-log = "2.6.0"
-tauri-plugin-shell = "2.3.0"
+tauri-plugin-log = "2.8.0"
+tauri-plugin-shell = "2.3.5"
 reqwest = { version = "0.12.12", features = ["json"] }
 zip = "2.2.3"
 sysinfo = '0.33.1'
 # planif = { git = "https://github.com/mattrobineau/planif", tag = "1.0.1" }
 whoami = "1.5.2"
-tauri-plugin-fs = "2.4.1"
-tauri-plugin-clipboard-manager = "2.3.0"
+tauri-plugin-fs = "2.5.1"
+tauri-plugin-clipboard-manager = "2.3.2"
 rand = "0.9.0"
 tokio = { version = "1.45.1", features = ["process"] }
-tauri-plugin-dialog = "2.3.1"
+tauri-plugin-dialog = "2.7.1"
 # prost = "0.13"
 # prost-types = "0.13"
 hashbrown = "0.15.2"
@@ -56,6 +56,6 @@ version = "0.61.3"
 features = ["Win32_System_TaskScheduler", "Win32_System_Com", "Win32_System_Power", "Win32_NetworkManagement_IpHelper", "Win32_NetworkManagement_Ndis", "Win32_Networking_WinSock"]
 
 [target."cfg(not(any(target_os = \"android\", target_os = \"ios\")))".dependencies]
-tauri-plugin-cli = "2.4.0"
-tauri-plugin-single-instance = "2.3.2"
-tauri-plugin-window-state = "2.4.0"
+tauri-plugin-cli = "2.4.1"
+tauri-plugin-single-instance = "2.4.2"
+tauri-plugin-window-state = "2.4.1"

src-tauri/capabilities/default.json

@@ -2,7 +2,7 @@
 	"$schema": "../gen/schemas/desktop-schema.json",
 	"identifier": "default",
 	"description": "enables the default permissions",
-	"windows": ["main", "log", "member", "cidr", "advance", "tool", "server", "gameList", "storage-listener"],
+	"windows": ["main", "log", "member", "nodesList", "cidr", "advance", "tool", "server", "gameList", "storage-listener"],
 	"permissions": [
 		"core:default",
 		"core:window:allow-minimize",

src-tauri/easytier/config_template.json

@@ -14,7 +14,13 @@
     "networkName": "",  //房间名
     "networkPassword": "", //房间密码
     "hostname": "", //主机名
-    "ipv4": "", // 虚拟IP地址
+    "ipv4": "", // 虚拟IPv4地址
+    "ipv6": "", // 虚拟IPv6地址
+    "tcpWhitelistEnable": false, // 启用TCP白名单
+    "udpWhitelistEnable": false, // 启用UDP白名单
+    "tcpWhitelist": "", // TCP端口白名单，格式为 "80" 或者 范围 "8000-9000"
+    "udpWhitelist": "", // UDP端口白名单，格式为 "53" 或者 范围 "5000-6000"
+    "connectAfterStart": false, // 启动后自动连接
     "disableIpv6": false,  // 禁用ipv6
     "disbleListenner": false, //    禁用监听
     "disableEncryption": false, // 禁用加密
@@ -31,6 +37,11 @@
     "enableNetCardMetric": true, // 启用自定义网卡跃点
     "netCardMetricValue": 1, // 网卡跃点
     "enablePreventSleep": false, // 启用防止睡眠
+    "enableUdpBroadcastRelay": true, // Windows UDP广播中继
+    "enableUpnp": true, // UPnP端口映射
+    "ipv6PublicAddrProvider": false, // 公网IPv6地址前缀提供
+    "ipv6PublicAddrAuto": false, // 公网IPv6地址自动获取
+    "disableRelayData": false, // 禁用Relay数据转发
     "compression": "none", // 压缩算法
     "enableKcpProxy": true, // 启用kcp代理，就不能启用quic代理
     "disableKcpInput": false, //     禁用kcp输入

src-tauri/src/lib.rs

@@ -1,7 +1,7 @@
 use reqwest::{Client, Error};
 // use futures_util::StreamExt;
-use serde::{Deserialize, Serialize};
-use std::collections::HashMap;
+use serde::{Deserialize};
+// use std::collections::HashMap;
 use std::fs::{self, File};
 use std::io::{BufRead, BufReader, Write};
 use std::os::windows::process::CommandExt;
@@ -237,38 +237,6 @@ fn get_tool_exe_path(path: &str) -> String {
     return tool_path;
 }
 
-#[derive(Serialize, Deserialize, Debug)]
-struct RoutePeerInfo {
-    peer_id: u64,
-    cost: u64,
-    hostname: Option<String>,
-    udp_stun_info: String,
-    easytier_version: String,
-    network_length: u64,
-}
-
-#[derive(Serialize, Deserialize, Debug)]
-struct RouteTable {
-    peer_infos: HashMap<u32, RoutePeerInfo>,
-    ipv4_peer_id_map: HashMap<String, u64>,
-}
-
-#[derive(Serialize, Deserialize, Debug)]
-struct PeerRouteServiceImpl {
-    route_table_with_cost: RouteTable,
-}
-
-#[derive(Serialize, Deserialize, Debug)]
-struct PeerRoute {
-    my_peer_id: u64,
-    service_impl: PeerRouteServiceImpl,
-}
-
-#[derive(Serialize, Deserialize, Debug)]
-struct MyResponse {
-    response: PeerRoute,
-}
-
 
 #[tauri::command(rename_all = "snake_case")]
 async fn get_members_by_cli() -> String {
@@ -299,10 +267,69 @@ async fn get_members_by_cli() -> String {
     }
 }
 
+#[tauri::command(rename_all = "snake_case")]
+async fn get_members_proxy() -> String {
+     let cli_path = get_tool_exe_path("\\easytier\\easytier-cli.exe");
+    match tokioCommand::new(&cli_path)
+        .arg("-o")
+        .arg("json")
+        .arg("proxy")
+        .creation_flags(0x08000000)
+        .output()
+        .await
+    {
+        Ok(output) => {
+            if output.status.success() {
+                let output_str = String::from_utf8_lossy(&output.stdout);
+                return output_str.trim().to_string();
+            } else {
+                let output_str = String::from_utf8_lossy(&output.stderr);
+                log::error!("{}", output_str.trim().to_string());
+                return "_EasytierGameCliFailedToGetProxy_".to_string();
+            }
+        }
+        Err(_e) => {
+            log::error!("get member list error");
+            return "".to_string();
+        }
+    }
+}
+
+#[tauri::command(rename_all = "snake_case")]
+async fn get_members_connections_cli() -> String {
+    let cli_path = get_tool_exe_path("\\easytier\\easytier-cli.exe");
+    match tokioCommand::new(&cli_path)
+        .arg("-v")
+        .arg("-o")
+        .arg("json")
+        .arg("peer")
+        .creation_flags(0x08000000)
+        .output()
+        .await
+    {
+        Ok(output) => {
+            if output.status.success() {
+                let output_str = String::from_utf8_lossy(&output.stdout);
+                return output_str.trim().to_string();
+            } else {
+                let output_str = String::from_utf8_lossy(&output.stderr);
+                log::error!("{}", output_str.trim().to_string());
+                return "_EasytierGameCliFailedToGetConnections_".to_string();
+            }
+        }
+        Err(_e) => {
+            log::error!("get member list error");
+            return "".to_string();
+        }
+    }
+}
+
 #[tauri::command(rename_all = "snake_case")]
 async fn get_route_by_cli() -> String {
     let cli_path = get_tool_exe_path("\\easytier\\easytier-cli.exe");
     match tokioCommand::new(&cli_path)
+        .arg("-o")
+        .arg("json")
         .arg("route")
         .creation_flags(0x08000000)
         .output()
@@ -694,11 +721,11 @@ fn autostart_enabled() -> Result<bool, Box<dyn std::error::Error>> {
 fn autostart_is_enabled() -> bool {
     match autostart_enabled() {
         Ok(enabled) => {
-            println!("autostart enabled: {}", enabled);
+            // println!("autostart enabled: {}", enabled);
             return enabled;
         }
-        Err(e) => {
-            log::error!("autostart enabled: false -> {}", e);
+        Err(_e) => {
+            // log::error!("autostart enabled: false -> {}", e);
             return false;
         }
     }
@@ -816,7 +843,7 @@ fn autostart(enabled: bool) -> std::result::Result<(), Box<dyn std::error::Error
             exec_action.SetPath(&BSTR::from(exe_path))?;
             exec_action.SetArguments(&BSTR::from("--task-auto-start"))?;
 
-            // 使用当前用户运行
+            // 设置任务权限为当前用户
             let principal = task_definition.Principal()?;
             principal.SetUserId(&BSTR::from(whoami::username().as_str()))?;
             principal.SetLogonType(TASK_LOGON_INTERACTIVE_TOKEN)?;
@@ -825,7 +852,7 @@ fn autostart(enabled: bool) -> std::result::Result<(), Box<dyn std::error::Error
             // 设置任务设置
             let settings = task_definition.Settings()?;
             settings.SetEnabled(VARIANT_BOOL::from(true))?;
-            settings.SetCompatibility(TASK_COMPATIBILITY_V2)?; // Windows 7
+            settings.SetCompatibility(TASK_COMPATIBILITY_V2_1)?; // Windows 7
             settings.SetStartWhenAvailable(VARIANT_BOOL::from(true))?;
             // settings.SetHidden(VARIANT_BOOL::from(true))?; // 注释掉让任务可见
             settings.SetExecutionTimeLimit(&BSTR::from("PT0S"))?;
@@ -929,6 +956,8 @@ pub fn run() {
             fetch_game_releases,
             download_easytier_zip,
             get_members_by_cli,
+            get_members_connections_cli,
+            get_members_proxy,
             get_route_by_cli,
             fetch_nodes_list,
             search_pid_by_pname,

src-tauri/tauri.conf.json

@@ -1,7 +1,7 @@
 {
 	"$schema": "../node_modules/@tauri-apps/cli/config.schema.json",
 	"productName": "easytier-game",
-	"version": "1.5.0",
+	"version": "1.5.4",
 	"identifier": "com.tauri.easytier-game",
 
 	"build": {
@@ -12,7 +12,7 @@
 	"app": {
 		"windows": [
 			{
-				"title": "easytier-game 1.5.0",
+				"title": "easytier-game 1.5.4",
 				"label": "main",
 				"minWidth": 340,
 				"width": 340,
@@ -49,7 +49,7 @@
 		}
 	},
 	"bundle": {
-		"active": true,
+		"active": false,
 		"targets": "all",
 		"resources": [
 			"easytier/config/",
@@ -72,7 +72,9 @@
 		"windows": {
 			"webviewInstallMode": {
 				"type": "embedBootstrapper"
-			}
+			},
+			"wix": null,
+			"nsis": null
 		},
 		"createUpdaterArtifacts": false,
 		"icon": ["icons/icon.png", "icons/icon.rgba", "icons/icon.icns", "icons/icon.ico"]

stores/index.ts

@@ -44,6 +44,11 @@ const store = defineStore("main", {
 				enableNetCardMetric: true, //启用网卡自定义跃点
 				netCardMetricValue: 1, //自定义网卡跃点值
 				enablePreventSleep: false, //组织系统休眠
+				enableUdpBroadcastRelay: true, //Windows UDP广播中继
+				enableUpnp: true, //UPnP端口映射
+				ipv6PublicAddrProvider: false, //公网IPv6地址前缀提供
+				ipv6PublicAddrAuto: false, //公网IPv6地址自动获取
+				disableRelayData: false, //禁用Relay数据转发
 				compression: "none", //加密算法
 				enableKcpProxy: true, //启用kcp代理  默认开启
 				disableKcpInput: false, //禁用kcp输入
@@ -66,6 +71,8 @@ const store = defineStore("main", {
 				privateMode: false, //是否启用私有模式
 				privateNetworkName: "", // 私有模式房间名
 				privateNetworkPassword: "", // 私有模式密码
+				ipv6PublicAddrProvider: false, //公网IPv6地址前缀提供
+				disableRelayData: false, //禁用Relay数据转发
 			},
 			cidrEnable: false,
 			proxyForwardBySystem: false, // 是否通过系统内核转发子网代理数据包，禁用内置NAT

typings/index.d.ts

@@ -57,3 +57,65 @@ interface NodesResponse {
 	error: string | null;
 	message: string | null;
 }
+
+type Member = {
+	cidr: string;
+	ipv4: string;
+	hostname: string;
+	cost: string;
+	lat_ms: string;
+	loss_rate: string;
+	rx_bytes: string;
+	tx_bytes: string;
+	tunnel_proto: string;
+	nat_type: string;
+	id: string;
+	version: string;
+	connections_addrs: string[];
+	proxy?: [string, "Connected" | "Closed"];
+};
+
+type ConnectionsType = {
+	route: {
+		peer_id: number;
+		ipv4_addr: string | null;
+		next_hop_peer_id: number;
+		cost: number;
+		path_latency: number;
+		proxy_cidrs: string[];
+		hostname: string;
+		stun_info: {
+			udp_nat_type: number;
+			tcp_nat_type: number;
+			last_update_time: number;
+			public_ip: string[];
+			min_port: number;
+			max_port: number;
+		};
+	};
+	peer: {
+		peer_id: number;
+		conns: {
+			conn_id: string;
+			my_peer_id: number;
+			peer_id: number;
+			features: string[];
+			tunnel: {
+				tunnel_type: string;
+				local_addr: {
+					url: string;
+				};
+				remote_addr: {
+					url: string;
+				};
+			};
+		}[];
+	};
+};
+type Proxy = {
+	src: string;
+	dst: string;
+	start_time: string;
+	state: "Connected" | "Closed";
+	transport_type: string;
+};

utils/index.ts

@@ -3,10 +3,11 @@ import { writeText } from "@tauri-apps/plugin-clipboard-manager";
 import { open } from "@tauri-apps/plugin-shell";
 import { ElMessage } from "element-plus";
 import { flatMap, map } from "lodash-es";
+import { customRef, ref } from "vue";
 
 export const ENV = import.meta.env;
 
-export const mixedArray = (a: Array<string>, b: Array<string>, split:string="") => {
+export const mixedArray = (a: Array<string>, b: Array<string>, split: string = "") => {
 	return flatMap(a, protocol => map(b, port => `${protocol}${split}${port}`));
 };
 
@@ -21,6 +22,26 @@ export const bounce = (time = 3000) => {
 	};
 };
 
+export const inputBounceRef = (value: string, cb?: Function, delay = 650) => {
+	let timeout: number | null = null;
+	return customRef((track, trigger) => {
+		return {
+			get() {
+				track();
+				return value;
+			},
+			set(newValue) {
+				value = newValue;
+				trigger();
+				timeout && clearTimeout(timeout);
+				timeout = setTimeout(() => {
+					cb?.(newValue);
+				}, delay);
+			}
+		};
+	});
+};
+
 /**
  *
  * @param {number} size  byte number
@@ -73,7 +94,7 @@ export const ATJ = (promise: Promise<any>, errorExt: string | undefined = undefi
 		});
 };
 
-const _supportProtocols = ["tcp", "udp", "ws", "wss", 'srv', 'schema'];
+const _supportProtocols = ["tcp", "udp", "ws", "wss", "srv", "schema", "txt"];
 
 export const supportProtocols = () => {
 	return _supportProtocols.slice();