重大结构更新

+ 升级rust为1.8版本 + 升级tauri为最新版，以及其他包升级 + 现在构建分为window7和window7以上两种版本 + 优化分享配置弹窗遮盖问题 + 增加uninstall.exe（不会删除日志） + 增加windows.0.48.5.lib + 增加build.bat 内含windows7构建之前的操作
这是一个测试分支，用于rust最新包更新与适配
2025-05-19 10:27:56 +00:00 · 2025-01-16 16:53:51 +08:00 · 2025-01-10 18:42:02 +08:00 · 2025-01-09 10:33:42 +08:00 · 2025-01-09 09:53:35 +08:00 · 2025-01-08 15:04:57 +08:00
65 changed files with 7585 additions and 5882 deletions
@@ -10,7 +10,5 @@ dist
 .idea
 .vscode
 release
-src-tauri/easytier-cli.exe
-src-tauri/easytier-core.exe
-src-tauri/Packet.dll
-src-tauri/wintun.dll
+
+src-tauri/easytier/logs
@@ -1 +1 @@
-18.18.2
+20.18.1
@@ -0,0 +1,23 @@
+{
+    "plugins": ["prettier-plugin-tailwindcss"],
+    "arrowParens": "avoid",
+    "bracketSpacing": true,
+    "endOfLine": "lf",
+    "htmlWhitespaceSensitivity": "ignore",
+    "insertPragma": false,
+    "singleAttributePerLine": true,
+    "bracketSameLine": false,
+    "jsxBracketSameLine": false,
+    "jsxSingleQuote": true,
+    "printWidth": 150,
+    "proseWrap": "preserve",
+    "quoteProps": "as-needed",
+    "requirePragma": false,
+    "semi": true,
+    "singleQuote": false,
+    "tabWidth": 4,
+    "trailingComma": "none",
+    "useTabs": true,
+    "embeddedLanguageFormatting": "auto",
+    "vueIndentScriptAndStyle": true
+}
@@ -28,7 +28,8 @@ Releases： [https://github.com/EasyTier/EasytierGame/releases](https://github.c
 - 如果还是无法满足您的需求，可以使用配置文件进行启动，具体如何配置，可以查看文档[配置文件](/guide/network/config-file.html)
    ![game-step5](/assets/game-step5.png)

- easytier内核升级后，可以点击更新插件按钮就可以进行更新，但是需要出国，如果无法更新，可以在群里获取
+- easytier内核升级后，可以点击内核管理按钮就可以进行内核切换和更新，但是需要出国或者github加速链接，如果无法更新，可以在群里获取
+- 1.2.6内核管理下载的内核 保存于easytier/cache目录，下次切换不用二次下载
    ![game-step6](/assets/game-step6.png)

 - 1.1.4更新了 配置分享功能 可以与朋友之间分享配置，方便联机
@@ -41,6 +42,23 @@ Releases： [https://github.com/EasyTier/EasytierGame/releases](https://github.c

 ![game-step9](/assets/game-step9.png)

+- 1.1.8 新增了 生成 easytier/config.json 的功能 会将一部分配置写入到 config.json 文件中，方便用户自定义配置，你可以在高级设置里启用和关闭这个功能(默认关闭)
+**需要注意的是，如果config.json存在，每次启动easytierGame默认按照config.json的配置为准**
+**解压zip后你可以查看 easytier/config_template.json 里的注释进行配置**
+![game-step10](/assets/game-step10.png)
+
+- 1.2.3新增了帮助.txt 位于“easytier/帮助.txt" 内含 无法打开界面和卸载EasytierGame的办法，新增 "easytier/clear_local_data.bat" 用于清除easytierGame的本地缓存数据（需要管理员模式运行）
+![game-step11](/assets/game-step11.png)
+
+- 1.2.5新增 自建服务器功能，可以自行搭建服务器，但是需要一些网络知识，具体可以查看文档[自建服务器](https://www.easytier.top/guide/network/host-public-server.html)
+![game-step12](/assets/game-step12.png)
+
+- 1.2.6重写 自建服务器功能，可以自行搭建服务器，但是需要一些网络知识，具体可以查看文档[自建服务器](https://www.easytier.top/guide/network/host-public-server.html),也可查看帮助.txt
+![game-step13](/assets/game-step13.png)
+
+- 1.3.5 增强工具 新增了forceBindIP
+![game-step14](/assets/game-step14.png)
+
 ## 特性

 - 基于easytier组网工具开发，界面清晰简单
@@ -54,6 +72,13 @@ Releases： [https://github.com/EasyTier/EasytierGame/releases](https://github.c

 支持Windows 11 、Windows 10 、 Windows 7

+## 群聊交流
+- 主群 EasyTier 支持 
+### 949700262
+
+- EasyTier游戏联机交流群
+### 596667137
+


 ## 请不要将本程序和仓库代码用于任何违法用途，由此产生的一切后果，仓库所有者和参与开发的人员不承担任何责任
@@ -6,6 +6,30 @@
 <script setup lang="ts">
 	import useMainStore from "@/stores/index";
 	import { initTheme } from "@/composables/theme";
+	import { warn, debug, trace, info, error } from "@tauri-apps/plugin-log";
+	function forwardConsole(fnName: "log" | "debug" | "info" | "warn" | "error", logger: (message: string) => Promise<void>) {
+		const original = console[fnName];
+		console[fnName] = message => {
+			original(message);
+			try {
+				if (typeof message === "string") {
+					logger(message);
+				} else {
+					logger(JSON.stringify(message));
+				}
+			} catch (e) {
+				logger(`${message}`);
+			}
+		};
+	}
+	if (import.meta.env.PROD) {
+		forwardConsole("log", info);
+		forwardConsole("debug", debug);
+		forwardConsole("info", info);
+		forwardConsole("warn", warn);
+		forwardConsole("error", error);
+	}
+
 	const mainStore = useMainStore();
 	// console.log(mainStore.theme)
 	initTheme(mainStore.theme);
@@ -9,7 +9,9 @@
 		font-family: "Helvetica Neue", "Luxi Sans", "DejaVu Sans", Tahoma, "Hiragino Sans GB", STHeiti, "Microsoft YaHei";
 	}
 } */
-
+html {
+	font-family: "Helvetica Neue",Helvetica,"PingFang SC","Hiragino Sans GB","Microsoft YaHei","微软雅黑",Arial,sans-serif;
+}
 html,
 body {
 	height: 100%;
@@ -27,8 +29,31 @@ html.dark body {
 }

 #__easytier {
+	display: flex;
+	flex-direction: column;
+	flex-wrap: nowrap;
 	height: 100%;
 	overflow: hidden;
 	box-sizing: border-box;
 	padding: 3px 5px;
 }
+
+.full-label .el-form-item__label {
+	width: 100%;
+	padding-right: 0;
+}
+
+.full-content .el-form-item__content {
+	/* height: 100%; */
+	align-items: flex-start;
+	overflow: auto;
+	flex: 1;
+}
+
+.el-table {
+	font-size: 12px!important;
+}
+
+.el-select-dropdown__wrap {
+	max-height: 150px!important;
+}
@@ -0,0 +1,11 @@
+rustup default nightly
+@echo 使用rust nightly构建支持win7的版本，请先将根目录的windows.0.48.5 放入以下目录
+@echo C:\Program Files\Microsoft Visual Studio\2022\Community\VC\Tools\MSVC\你自己的版本\lib\x64
+@echo C:\Program Files\Microsoft Visual Studio\2022\Community\VC\Tools\MSVC\你自己的版本\lib\x86
+@echo C:\Program Files\Microsoft Visual Studio\2022\Community\VC\Tools\MSVC\你自己的版本\atlmfc\lib\x64
+@echo 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
+rustup default stable
+pnpm tauri build
+pnpm run release
+pnpm run release-win7
@@ -0,0 +1,3 @@
+<template>
+    <ElTag size="small" type="danger">内核 >= {{ $attrs.version }}</ElTag>
+</template>
@@ -0,0 +1,51 @@
+import { BaseDirectory, writeTextFile } from "@tauri-apps/plugin-fs";
+import useMainStore from "@/stores/index";
+import { ElMessage } from "element-plus";
+import { uniq, intersection, isNil } from "lodash-es";
+export const updateConfigJson = async (configJsonSeverUrl: Array<string> | string | null | undefined) => {
+	const mainStore = useMainStore();
+	const path = import.meta.env.VITE_CONFIG_FILE_NAME;
+	if (isNil(configJsonSeverUrl)) {
+		configJsonSeverUrl = [];
+	}
+	const isArray = Array.isArray(configJsonSeverUrl);
+	const isString = typeof configJsonSeverUrl === "string";
+	try {
+		const {
+			proxyNetworks,
+			autoStart,
+			relayAllPeerrpc,
+			connectAfterStart,
+			multiThread,
+			enablExitNode,
+			useSmoltcp,
+			saveErrorLog,
+			logLevel,
+			serverUrl,
+			port,
+			enableCustomListener,
+			enablePreventSleep,
+			customListenerData,
+			customListenerV6Data,
+			enableCustomListenerV6,
+			...otherConfig
+		} = mainStore.config;
+		let writeServerUrl: Array<string> | string = serverUrl;
+		if (isArray) {
+			writeServerUrl = intersection(
+				uniq([serverUrl, ...configJsonSeverUrl]).filter(boolean => boolean),
+				mainStore.basePeers
+			);
+		}
+		if (isString && configJsonSeverUrl) {
+			writeServerUrl = intersection(
+				uniq([serverUrl, ...(configJsonSeverUrl as string).split(",")]).filter(boolean => boolean),
+				mainStore.basePeers
+			).join(",");
+		}
+		await writeTextFile(path, JSON.stringify({ serverUrl: writeServerUrl, ...otherConfig }, null, 4), { baseDir: BaseDirectory.Resource });
+	} catch (err) {
+		console.error(err);
+		ElMessage.error(`更新config.json失败`);
+	}
+};
@@ -1,8 +0,0 @@
-// const infoDialog = new WebviewWindow("log", {
-//     title: "日志",
-//     resizable: false,
-//     width: 600,
-//     height: 400,
-//     parent: appWindow,
-//     url: "/log"
-// });
@@ -2,47 +2,59 @@ import { invoke } from "@tauri-apps/api/core";
 import { Command } from "@tauri-apps/plugin-shell";
 import { ElMessage, type TabPaneName } from "element-plus";
 import useMainStore from "@/stores/index";
+import { BaseDirectory } from "@tauri-apps/api/path";
+import { exists } from "@tauri-apps/plugin-fs";

 const getWinIpBroadcastPid = async () => {
-    const mainStore = useMainStore();
-    const pid = await invoke("search_pid_by_pname", { target_process_name: "WinIPBroadcast" });
-    mainStore.winipBcPid = (pid as number) || 0;
-    if (mainStore.winipBcPid && mainStore.winipBcPid > 0) {
-        mainStore.winipBcStart = true;
-    } else {
-        mainStore.winipBcStart = false;
-    }
+	const mainStore = useMainStore();
+	const pid = await invoke("search_pid_by_pname", { target_process_name: "WinIPBroadcast" });
+	mainStore.winipBcPid = (pid as number) || 0;
+	mainStore.$patch({
+		winipBcStart: !!(mainStore.winipBcPid && mainStore.winipBcPid > 0)
+	});
 };

 export const handleWinipBcStart = async () => {
-    const mainStore = useMainStore();
-    if (!mainStore.winipBcStart) {
-        try {
-            await invoke("stop_command", { child_id: mainStore.winipBcPid || 0 });
-            const child = await Command.create("WinIPBroadcast", ["run"]).spawn();
-            mainStore.winipBcPid = child.pid || 0;
-            if (mainStore.winipBcPid) {
-                mainStore.winipBcStart = true;
-				mainStore.winIpBcAutoStart = true;
-            } else {
-                ElMessage.error(`启动失败`);
-            }
-        } catch (err) {
-            ElMessage.error(`启动失败`);
-            console.log(err);
-        }
-    } else {
-		mainStore.winIpBcAutoStart = false;
-        await invoke("stop_command", { child_id: mainStore.winipBcPid || 0 });
-        await getWinIpBroadcastPid();
-    }
+	const mainStore = useMainStore();
+	if (!mainStore.winipBcStart) {
+		try {
+			await invoke("stop_command", { child_id: mainStore.winipBcPid || 0 });
+			const isExists = await exists("easytier/tool/WinIPBroadcast.exe", { baseDir: BaseDirectory.Resource });
+			if (!isExists) {
+				ElMessage.error(`WinipBc不存在`);
+				console.error(`WinipBc不存在`);
+				return;
+			}
+			const child = await Command.create("WinIPBroadcast", ["run"]).spawn();
+			mainStore.winipBcPid = child.pid || 0;
+			await getWinIpBroadcastPid();
+			if (mainStore.winipBcPid) {
+				mainStore.$patch({
+					winIpBcAutoStart: true
+				});
+			} else {
+				ElMessage.error(`WinipBc失败`);
+			}
+		} catch (err) {
+			ElMessage.error(`WinipBc失败`);
+			console.error(err);
+		}
+	} else {
+		await invoke("stop_command", { child_id: mainStore.winipBcPid || 0 });
+		await getWinIpBroadcastPid();
+		if (mainStore.winipBcPid <= 0) {
+			mainStore.$patch({
+				winIpBcAutoStart: false
+			});
+		}
+	}
 };

 export const initStartWinIpBroadcast = async () => {
-    const mainStore = useMainStore();
-    await getWinIpBroadcastPid();
-    // console.log(mainStore.winipBcStart, mainStore.winIpBcAutoStart)
-    if (mainStore.winIpBcAutoStart && !mainStore.winipBcStart) {
-        await handleWinipBcStart();
-    }
-};
+	const mainStore = useMainStore();
+	await getWinIpBroadcastPid();
+	// console.error(mainStore.winipBcStart, mainStore.winIpBcAutoStart)
+	if (mainStore.winIpBcAutoStart && !mainStore.winipBcStart) {
+		await handleWinipBcStart();
+	}
+};
@@ -0,0 +1,24 @@
+import useMainStore from "@/stores/index";
+export const getServerArgs = () => {
+	const mainStore = useMainStore();
+	const args = [];
+	if (!mainStore.serverConfig.port) {
+		mainStore.serverConfig.port = "11010";
+	}
+	args.push("-l", mainStore.serverConfig.port);
+	if (mainStore.serverConfig.relayAllPeerrpc) {
+		args.push("--relay-all-peer-rpc");
+	}
+	const whiteList = mainStore.serverConfig.serverWhiteList
+		.trim()
+		.split("\n")
+		.map(el => el.trim())
+		.filter(el => el)
+	if (whiteList && mainStore.serverConfig.enableWhiteList) {
+		args.push("--relay-network-whitelist", ...whiteList);
+	}
+	if (!whiteList && mainStore.serverConfig.enableWhiteList) {
+		args.push("--relay-network-whitelist");
+	}
+	return args;
+};
@@ -4,6 +4,10 @@ import { getCurrentWindow } from "@tauri-apps/api/window";
 import pkg from "@/package.json";
 import { setTheme } from "~/composables/theme";
 import useMainStore from "@/stores/index";
+import { resourceDir as getResourceDir, join } from "@tauri-apps/api/path";
+import { invoke } from "@tauri-apps/api/core";
+// import { ElConfirmPrimary } from "~/utils/element";
+import { open } from "@tauri-apps/plugin-shell";

 const DEFAULT_TRAY_NAME = "main";

@@ -12,11 +16,12 @@ async function toggleVisibility() {
 		await getCurrentWindow().hide();
 	} else {
 		await getCurrentWindow().show();
+		await getCurrentWindow().unminimize();
 		await getCurrentWindow().setFocus();
 	}
 }

-export async function useTray(init: boolean = false, beforExit: Function) {
+export async function useTray(init: boolean = false, beforExit: Function, handleConnection: Function) {
 	let tray;
 	try {
 		tray = await TrayIcon.getById(DEFAULT_TRAY_NAME);
@@ -27,7 +32,7 @@ export async function useTray(init: boolean = false, beforExit: Function) {
 				id: DEFAULT_TRAY_NAME,
 				menu: await Menu.new({
 					id: "main",
-					items: await generateMenuItem(beforExit),
+					items: await generateMenuItem(beforExit, handleConnection),
 				}),
 				action: async (e) => {
 					toggleVisibility();
@@ -35,7 +40,7 @@ export async function useTray(init: boolean = false, beforExit: Function) {
 			});
 		}
 	} catch (error) {
-		console.warn("Error while creating tray icon:", error);
+		console.error("Error while creating tray icon:", error);
 		return null;
 	}

@@ -45,7 +50,7 @@ export async function useTray(init: boolean = false, beforExit: Function) {
 		tray.setMenu(
 			await Menu.new({
 				id: "main",
-				items: await generateMenuItem(beforExit),
+				items: await generateMenuItem(beforExit, handleConnection),
 			})
 		);
 	}
@@ -53,11 +58,14 @@ export async function useTray(init: boolean = false, beforExit: Function) {
 	return tray;
 }

-export async function generateMenuItem(beforExit: Function) {
+export async function generateMenuItem(beforExit: Function, handleConnection:Function) {
 	return [
 		await MenuItemShow("显示 / 隐藏"),
+		await MenuItemExchangeConnection("联机 / 断开", handleConnection),
 		await MenuItemTheme(),
 		await PredefinedMenuItem.new({ item: "Separator" }),
+		await MenuItemPublicPeers(),
+		await PredefinedMenuItem.new({ item: "Separator" }),
 		await MenuItemExit("退出", beforExit),
 	];
 }
@@ -75,6 +83,17 @@ export async function MenuItemExit(text: string, beforExit: Function) {
 	});
 }

+export async function MenuItemPublicPeers() {
+
+	return await MenuItem.new({
+		id: "publicPeers",
+		text: "公共节点",
+		action: async () => {
+			await open("https://easytier.gd.nkbpal.cn/status/easytier")
+		},
+	});
+}
+
 export async function MenuItemShow(text: string) {
 	return await MenuItem.new({
 		id: "show",
@@ -85,6 +104,17 @@ export async function MenuItemShow(text: string) {
 	});
 }

+export async function MenuItemExchangeConnection(text: string, handleConnection:Function) {
+	const menutItem =  await MenuItem.new({
+		id: "exchangeConnection",
+		text,
+		action: async () => {
+			const isStart = await handleConnection();
+		},
+	});
+	return menutItem;
+}
+
 export async function MenuItemTheme() {
 	return await MenuItem.new({
 		id: "theme",
@@ -113,7 +143,10 @@ export async function MenuItemTheme() {

 export async function setTrayRunState(tray: TrayIcon | null, isRunning: boolean = false) {
 	if (!tray) return;
-	await tray.setIcon(isRunning ? "easytier/icons/icon-inactive.ico" : "easytier/icons/icon.ico");
+	const resourceDir = await getResourceDir();
+	const path = await join(resourceDir, isRunning ? "easytier/icons/icon-inactive.ico" : "easytier/icons/icon.ico");
+	// "easytier/icons/icon-inactive.ico", { baseDir: BaseDirectory.Resource }
+	await tray.setIcon(path);
 }

 export async function setTrayTooltip(tray: TrayIcon | null, tooltip?: string | null) {
@@ -124,3 +157,19 @@ export async function setTrayTooltip(tray: TrayIcon | null, tooltip?: string | n
 		await tray.setTooltip(`EasyTierGame\n${pkg.version}`);
 	}
 }
+
+
+export const checkNewVersion = async () => {
+	let [tagName, downloadUrl] = await invoke<string[]>("fetch_game_releases");
+	if(tagName && pkg.version !== tagName) {
+		return true; //有新版
+		// const [err] = await ElConfirmPrimary("有新版本是否下载?", "发现新版本", {
+		// 	confirmButtonText: "下载",
+		// 	cancelButtonText: "取消",
+		// })
+		// if(!err) {
+		// 	open(downloadUrl);
+		// }
+	}
+	return false; //没有新版
+}
@@ -1,48 +1,60 @@
 import { type UnlistenFn } from "@tauri-apps/api/event";
-import { getCurrentWindow, PhysicalPosition, type WindowOptions, Window } from "@tauri-apps/api/window";
+import { getCurrentWindow, PhysicalPosition, type WindowOptions, Window, currentMonitor } from "@tauri-apps/api/window";
 import { WebviewWindow } from "@tauri-apps/api/webviewWindow";
-import type { WebviewLabel, WebviewOptions, } from "@tauri-apps/api/webview";
+import type { WebviewLabel, WebviewOptions } from "@tauri-apps/api/webview";
+import useMainStore from "@/stores/index";
+import { onBeforeUnmount } from "vue";
+
+const _listenersMaps: { [key: string]: [UnlistenFn | null, UnlistenFn | null] } = {};
+
 export default async (
 	label: WebviewLabel,
 	options?: Omit<WebviewOptions, "x" | "y" | "width" | "height"> & WindowOptions,
 	afterCreatedFunc?: (webviewWindow: WebviewWindow, appWindow: Window) => void | null,
 	beforeCloseFunc?: () => void | null
 ) => {
-    let defaultOpts = {
-		parent: undefined,
-		closable: true,
-		resizable: true,
-		decorations: true,
-		maximizable: false,
-		minimizable: false,
-        x: 0,
-        y: 0
-	};
-	const appWindow = getCurrentWindow();
-	if (appWindow) {
-		const appSize = await appWindow.outerSize();
-		const factor = await appWindow.scaleFactor();
-		const appPosition = await appWindow.outerPosition();
-		const logicalPosition = new PhysicalPosition(appPosition.x + appSize.width, appPosition.y).toLogical(factor);
-        defaultOpts.parent = appWindow as any;
-        defaultOpts.x = logicalPosition.x;
-        defaultOpts.y = logicalPosition.y;
-	}
-	let unListenlogClose: UnlistenFn | null = null;
-	let unlistenLogCreated: UnlistenFn | null = null;
+	const unlistenFnList: [UnlistenFn | null, UnlistenFn | null] = _listenersMaps[label] || [null, null];
+	let [unlistenLogCreated, unListenlogClose] = unlistenFnList;
 	let dialog = await WebviewWindow.getByLabel(label);
 	if (!dialog) {
-		dialog = new WebviewWindow(label, {...defaultOpts, ...options});
-		unlistenLogCreated = await dialog.once("tauri://webview-created", async () => {
+		let defaultOpts: { [key: string]: any; parent: Window | undefined } = {
+			parent: undefined,
+			closable: true,
+			resizable: true,
+			decorations: true,
+			maximizable: false,
+			minimizable: false,
+			x: 0,
+			y: 0
+		};
+		const appWindow = getCurrentWindow();
+		if (appWindow) {
+			const appSize = await appWindow.outerSize();
+			const factor = await appWindow.scaleFactor();
+			const appPosition = await appWindow.outerPosition();
+			const logicalPosition = new PhysicalPosition(appPosition.x + appSize.width, appPosition.y).toLogical(factor);
+			defaultOpts.parent = appWindow;
+			// console.error(logicalPosition);
+			defaultOpts.x = logicalPosition.x;
+			defaultOpts.y = logicalPosition.y;
+		}
+		unlistenLogCreated && (await (unlistenLogCreated as Function)());
+		unListenlogClose && (await unListenlogClose());
+		dialog = new WebviewWindow(label, { ...defaultOpts, ...options });
+		unlistenLogCreated = await dialog.listen("tauri://webview-created", async () => {
 			if (dialog) {
 				afterCreatedFunc && (await afterCreatedFunc(dialog, appWindow));
 				await dialog.show();
 			}
 		});
+		unlistenFnList[0] = unlistenLogCreated;
 		unListenlogClose = await dialog.onCloseRequested(async () => {
 			beforeCloseFunc && (await beforeCloseFunc());
 			unListenlogClose && (await unListenlogClose());
+			unlistenLogCreated && (await (unlistenLogCreated as Function)());
 		});
+		unlistenFnList[1] = unlistenLogCreated;
+		_listenersMaps[label] = unlistenFnList;
 	} else {
 		const visible = await dialog.isVisible();
 		if (visible) {
@@ -51,3 +63,25 @@ export default async (
 		}
 	}
 };
+
+export const dataSubscribe = async (cb?: (...args: any) => any) => {
+	if (!cb) return;
+	const mainStore = useMainStore();
+	const currentWindow = getCurrentWindow();
+	let removeSubscribe = mainStore.$subscribe(async (...args) => {
+		const emitData = await cb(args);
+		await currentWindow.emitTo({ kind: "Window", label: "main" }, "config", emitData);
+	});
+	const unlisten = currentWindow.listen<any>("global-main-store", event => {
+		removeSubscribe && removeSubscribe();
+		mainStore.$patch({ ...event.payload.store }); // 更新全局状态
+		removeSubscribe = mainStore.$subscribe(async (...args) => {
+			const emitData = await cb(args);
+			await currentWindow.emitTo({ kind: "Window", label: "main" }, "config", emitData);
+		});
+	});
+	onBeforeUnmount(async () => {
+		unlisten && (await unlisten)();
+		removeSubscribe && removeSubscribe();
+	});
+};
@@ -1,3 +1,5 @@
 VITE_CONFIG_PATH=easytier/config/
+VITE_CONFIG_FILE_NAME=easytier/config.json
 VITE_LOG_PATH=easytier/logs/
+VITE_CACHE_PATH=easytier/cache/
 VITE_AUTO_START_SERVICE_NAME=easytierGameAutoStart
@@ -1,3 +1,5 @@
 VITE_CONFIG_PATH=easytier/config/
+VITE_CONFIG_FILE_NAME=easytier/config.json
 VITE_LOG_PATH=easytier/logs/
+VITE_CACHE_PATH=easytier/cache/
 VITE_AUTO_START_SERVICE_NAME=easytierGameAutoStart
@@ -5,7 +5,8 @@
 <script setup lang="tsx">
 	//屏蔽右键菜单
 	document.addEventListener("contextmenu", (e: MouseEvent) => {
-		if (import.meta.env.PROD) {
+		const el = (e.target as HTMLElement);
+		if (import.meta.env.PROD && !el.classList.contains("el-input__inner") && !el.classList.contains("el-textarea__inner")) { // 所有输入框不禁用右键
 			e.preventDefault();
 		}
 	});
@@ -1,29 +1,33 @@
 import { defineNuxtConfig } from "nuxt/config";
-import fs from "fs";
 import path from "path";
 import vueJSX from "@vitejs/plugin-vue-jsx";
-const isDev = process?.argv?.[2] == "_dev" || process?.argv?.[2] == "dev";
-const optimizeDepsElementPlusIncludes = ["element-plus/es"];
-fs.readdirSync("node_modules/element-plus/es/components").map(dirname => {
-	fs.access(`node_modules/element-plus/es/components/${dirname}/style/css.mjs`, err => {
-		if (!err) {
-			optimizeDepsElementPlusIncludes.push(`element-plus/es/components/${dirname}/style/css`);
-		}
-	});
-});
+
 export default defineNuxtConfig({
 	ssr: false,

 	devServer: {
 		port: 5000
 	},
+	
+	telemetry: false,

 	imports: {
 		autoImport: false
 	},

-	css: ["~/assets/css/main.css", 'element-plus/theme-chalk/dark/css-vars.css'],
-	modules: ["@element-plus/nuxt", "@pinia/nuxt", "@pinia-plugin-persistedstate/nuxt", "@nuxtjs/tailwindcss"],
+	css: ["~/assets/css/main.css", "element-plus/theme-chalk/dark/css-vars.css"],
+	modules: [
+		"@element-plus/nuxt",
+		"@pinia/nuxt",
+		[
+			"pinia-plugin-persistedstate/nuxt",
+			{
+				key: "__glj_persisted_%id",
+				storage: "localStorage"
+			}
+		],
+		"@nuxtjs/tailwindcss"
+	],

 	alias: {
 		"@": path.resolve(__dirname, "./")
@@ -44,12 +48,10 @@ export default defineNuxtConfig({
 	},

 	vite: {
-		plugins: [
-			vueJSX({}),
-		],
+		plugins: [vueJSX({})],
 		envDir: "env",
 		optimizeDeps: {
-			include: [...optimizeDepsElementPlusIncludes]
+			// include: [...optimizeDepsElementPlusIncludes]
 		},
 		// prevent vite from obscuring rust errors
 		clearScreen: false,
@@ -84,7 +86,7 @@ export default defineNuxtConfig({

 	app: {
 		rootId: "__easytier",
-		cdnURL: "./", 
+		cdnURL: "./",
 		buildAssetsDir: "__easytier/",
 		head: {
 			meta: [
@@ -102,5 +104,6 @@ export default defineNuxtConfig({
 			// script: [],
 			// noscript: []
 		}
-	}
+	},
+	compatibilityDate: "2024-11-12"
 });
@@ -3,44 +3,40 @@
 	"private": true,
 	"author": "leizi97",
 	"description": "A simple network initiator based on Easytier",
-	"version": "1.1.6",
+	"version": "1.3.7",
 	"scripts": {
 		"dev": "nuxt dev --dotenv env/.env.dev --host 0.0.0.0",
-		"build": "nuxt generate --dotenv env/.env.prod"
+		"build": "nuxt generate --dotenv env/.env.prod",
+		"release": "node zip.js",
+		"release-win7": "node zip.js win7"
 	},
 	"devDependencies": {
 		"@element-plus/icons-vue": "^2.3.1",
-		"@element-plus/nuxt": "^1.0.9",
-		"@nuxtjs/tailwindcss": "^6.12.0",
-		"@pinia-plugin-persistedstate/nuxt": "^1.2.0",
-		"@pinia/nuxt": "^0.5.1",
-		"@tauri-apps/api": "^2.0.2",
-		"@tauri-apps/cli": "^2.0.2",
-		"@tauri-apps/plugin-cli": "^2.0.0",
-		"@tauri-apps/plugin-http": "^2.0.0",
-		"@tauri-apps/plugin-shell": "~2",
-		"@tinymce/tinymce-vue": "^5.1.1",
+		"@element-plus/nuxt": "^1.1.1",
+		"@nuxtjs/tailwindcss": "6.13.1",
+		"@pinia/nuxt": "0.9.0",
+		"@tauri-apps/api": "^2.2.0",
+		"@tauri-apps/cli": "2.2.4",
+		"@tauri-apps/plugin-cli": "^2.2.0",
+		"@tauri-apps/plugin-clipboard-manager": "2.2.0",
+		"@tauri-apps/plugin-fs": "^2.2.0",
+		"@tauri-apps/plugin-log": "^2.2.0",
+		"@tauri-apps/plugin-shell": "^2.2.0",
+		"@tauri-apps/plugin-window-state": "^2.2.0",
+		"@tauri-apps/plugin-dialog": "2.2.0",
 		"@types/lodash-es": "^4.17.12",
-		"@types/qs": "^6.9.15",
-		"@vitejs/plugin-vue-jsx": "^3.1.0",
-		"@vueuse/core": "^11.2.0",
-		"dayjs": "^1.11.10",
-		"defu": "^6.1.4",
-		"element-plus": "^2.8.6",
-		"less": "^4.2.0",
+		"@vitejs/plugin-vue-jsx": "^4.1.1",
+		"@vueuse/core": "12.4.0",
+		"archiver": "^7.0.1",
+		"element-plus": "2.9.3",
+		"less": "4.2.1",
 		"lodash-es": "^4.17.21",
-		"nuxt": "^3.11.2",
-		"pinia": "^2.1.7",
+		"nuxt": "3.15.2",
+		"pinia": "^2.3.0",
+		"pinia-plugin-persistedstate": "^4.2.0",
 		"postcss": "^8.4.38",
-		"qs": "^6.12.0",
-		"typescript": "^5.4.5",
-		"vue": "^3.4.24",
-		"vue-clipboard3": "^2.0.0",
-		"xlsx": "^0.18.5"
-	},
-	"dependencies": {
-		"@tauri-apps/plugin-autostart": "~2",
-		"@tauri-apps/plugin-clipboard-manager": "^2.0.0",
-		"@tauri-apps/plugin-fs": "~2"
+		"prettier": "3.4.2",
+		"prettier-plugin-tailwindcss": "0.6.10",
+		"vue-clipboard3": "^2.0.0"
 	}
 }
@@ -1,55 +1,255 @@
 <template>
-	<div class="h-full overflow-auto flex flex-col items-start px-[25px]">
+	<div class="flex h-full flex-col items-start overflow-auto px-[25px]">
+		<div class="flex flex-nowrap items-center gap-[15px]">
+			<div class="flex flex-nowrap items-center gap-[5px]">
+				<ElCheckbox v-model="mainStore.config.enableCustomProtocol">默认直连(p2p)使用的协议</ElCheckbox>
+				<ElTooltip content="如果没有支持该协议的节点地址，程序会自动处理，请放心使用">
+					<ElIcon><QuestionFilled /></ElIcon>
+				</ElTooltip>
+			</div>
+			<div class="w-[80px]">
+				<ElSelect
+					size="small"
+					v-model="mainStore.config.customProtocol"
+					placeholder="请选择协议"
+					class="ml-[5px]"
+				>
+					<ElOption
+						v-for="item in protocols"
+						:key="item"
+						:label="`${item}`"
+						:value="item"
+					></ElOption>
+				</ElSelect>
+			</div>
+		</div>
+		<div>
+			<ElCheckbox v-model="mainStore.config.relayAllPeerrpc">帮助对等节点建立直连(p2p)通信</ElCheckbox>
+		</div>
+		<div><ElCheckbox v-model="mainStore.config.connectAfterStart">软件启动后，自动"启动联机"(搭配开机自启，无感联机)</ElCheckbox></div>
+		<div class="flex flex-nowrap items-center gap-[15px]">
+			<ElCheckbox v-model="mainStore.createConfigInEasytier">自动生成界面配置文件easytier/config.json</ElCheckbox>
+			<ElButton
+				@click="openConfigJsonDir"
+				size="small"
+			>
+				打开config.json目录
+			</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.latencyfirst">延迟优先模式，将尝试使用最低延迟路径转发流量</ElCheckbox>
+			<ElTooltip content="视网络质量进行选择，可能会出现中转与直连(p2p)来回切换的情况">
+				<ElIcon><QuestionFilled /></ElIcon>
+			</ElTooltip>
+		</div>
 		<div><ElCheckbox v-model="mainStore.config.disableIpv6">不使用IPv6</ElCheckbox></div>
+		<ElDivider />
+		<div class="flex items-center gap-[10px]">
+			<ElCheckbox v-model="mainStore.config.disbleListenner">不监听任何端口，只连接到对等节点</ElCheckbox>
+			<ElTooltip content="无法联机时，可以尝试开启这个选项">
+				<ElIcon><QuestionFilled /></ElIcon>
+			</ElTooltip>
+		</div>
+		<div class="flex items-center gap-[10px]">
+			<ElText
+				class="flex-shrink-0"
+				size="small"
+			>
+				监听端口
+			</ElText>
+			<ElInput
+				:disabled="mainStore.config.disbleListenner || mainStore.config.enableCustomListener"
+				size="small"
+				:maxlength="10"
+				v-model="mainStore.config.port"
+				placeholder="请输入端口号"
+			/>
+		</div>
+		<div class="flex items-center gap-[10px]">
+			<ElCheckbox
+				:disabled="mainStore.config.disbleListenner"
+				v-model="mainStore.config.enableCustomListener"
+			>
+				自定义监听地址
+			</ElCheckbox>
+			<ElButton
+				size="small"
+				:disabled="mainStore.config.disbleListenner"
+				@click="handleListenerDialog"
+			>
+				填写
+			</ElButton>
+			<ElDialog
+				width="95%"
+				top="10px"
+				append-to-body
+				:z-index="10"
+				class="!mb-0"
+				v-model="listenerDialogData.visible"
+				:close-on-press-escape="false"
+				title="自定义监听地址"
+			>
+				<ElInput
+					type="textarea"
+					:rows="8"
+					placeholder="请输入监听地址一行一个"
+					v-model="mainStore.config.customListenerData"
+				></ElInput>
+				<template #footer>
+					<div class="text-right">
+						<ElButton
+							size="default"
+							@click="handleFinishInputListener"
+							type="primary"
+						>
+							确定
+						</ElButton>
+					</div>
+				</template>
+			</ElDialog>
+		</div>
+		<div class="flex items-center gap-[10px]">
+			<ElCheckbox
+				:disabled="mainStore.config.disbleListenner"
+				v-model="mainStore.config.enableCustomListenerV6"
+			>
+				自定义IPV6监听地址
+			</ElCheckbox>
+			<div class="w-[200px]">
+				<ElInput
+					:disabled="mainStore.config.disbleListenner || mainStore.config.enableCustomListenerV6"
+					size="small"
+					:maxlength="100"
+					v-model="mainStore.config.customListenerV6Data"
+					placeholder="请输入自定义IPV6监听地址"
+				/>
+			</div>
+			<ElTooltip content="例如：tcp://[::]:11010，如果未设置，将在随机UDP端口上监听">
+				<ElIcon><QuestionFilled /></ElIcon>
+			</ElTooltip>
+			<CoreVersionWarning version="2.1.0" />
+		</div>
+		<ElDivider />
 		<div class="flex items-center gap-[10px]">
 			<ElCheckbox v-model="mainStore.config.devName">自定义网卡名</ElCheckbox>
-			<ElInput maxlength="10" v-model="mainStore.config.devNameValue" placeholder="请输入网卡名"/>
+			<ElInput
+				size="small"
+				maxlength="10"
+				v-model="mainStore.config.devNameValue"
+				placeholder="请输入网卡名"
+			/>
 		</div>
-		<div><ElCheckbox v-model="mainStore.config.disbleListenner">不监听任何端口，只连接到对等节点</ElCheckbox></div>
-		<div><ElCheckbox v-model="mainStore.config.coonectAfterStart">软件启动后，自动"启动联机"(搭配开机自启，无感联机)</ElCheckbox></div>
-		<div class="flex items-center gap-[15px] flex-nowrap">
+		<div class="flex items-center gap-[10px]">
+			<ElCheckbox v-model="mainStore.config.enableNetCardMetric">自定义easytier网卡跃点</ElCheckbox>
+			<ElInputNumber
+				controls-position="right"
+				:min="1"
+				:value-on-clear="1"
+				:max="9999"
+				:step="1"
+				:precision="0"
+				size="small"
+				v-model="mainStore.config.netCardMetricValue"
+				placeholder="请选择跃点数"
+			/>
+			<ElTooltip content="设置easytier网卡的跃点，提升网卡优先级，跃点越小，网卡优先级越高">
+				<ElIcon><QuestionFilled /></ElIcon>
+			</ElTooltip>
+		</div>
+		<div>
+			<ElText
+				size="small"
+				type="warning"
+			>
+				(不使用自定义网卡名,那么联机时默认会生成一个名为 "et_xxx" 的网卡，也可以使用 “设置跃点” 功能，除非你启用了下面的功能)
+			</ElText>
+		</div>
+		<div><ElCheckbox v-model="mainStore.config.noTun">不创建TUN设备(网卡)，可以使用子网代理访问节点</ElCheckbox></div>
+
+		<ElDivider />
+		<div><ElCheckbox v-model="mainStore.config.enablExitNode">允许此节点成为出口节点</ElCheckbox></div>
+		<div><ElCheckbox v-model="mainStore.config.disableEncryption">禁用对等节点通信的加密</ElCheckbox></div>
+		<div><ElCheckbox v-model="mainStore.config.multiThread">启用多线程运行</ElCheckbox></div>
+		<div class="flex items-center gap-[10px]">
+			<ElText>压缩算法</ElText>
+			<div class="w-[160px]">
+				<ElSelect
+					size="small"
+					v-model="mainStore.config.compression"
+					placeholder="请选择压缩算法"
+				>
+					<ElOption
+						v-for="item in [
+							['none', '不压缩(游戏联机推荐)'],
+							['zstd', 'zstd算法']
+						]"
+						:key="item[0]"
+						:label="item[1]"
+						:value="item[0]"
+					></ElOption>
+				</ElSelect>
+			</div>
+			<CoreVersionWarning version="2.1.0" />
+		</div>
+		<ElDivider />
+
+		<div><ElCheckbox v-model="mainStore.config.useSmoltcp">为子网代理启用smoltcp堆栈</ElCheckbox></div>
+		<div><ElCheckbox v-model="mainStore.config.disableUdpHolePunching">禁用UDP打洞功能</ElCheckbox></div>
+		<div class="flex flex-nowrap items-center gap-[15px]">
 			<ElCheckbox v-model="mainStore.config.saveErrorLog">输出日志到本地</ElCheckbox>
 			<div class="w-[140px]">
 				<ElSelect
+					size="small"
 					v-model="mainStore.config.logLevel"
 					placeholder="请选择日志等级"
-					class="ml-[5px]">
+					class="ml-[5px]"
+				>
 					<ElOption
 						v-for="item in data"
 						:key="item"
 						:label="`level - ${item}`"
-						:value="item"></ElOption>
+						:value="item"
+					></ElOption>
 				</ElSelect>
 			</div>
 			<ElButton
 				@click="openLogDir"
-				size="small">
+				size="small"
+			>
 				打开日志目录
 			</ElButton>
 		</div>
-		<ElDivider />
-		<div><ElCheckbox v-model="mainStore.config.enablExitNode">允许此节点成为出口节点</ElCheckbox></div>
-		<div><ElCheckbox v-model="mainStore.config.disableEncryption">禁用对等节点通信的加密，默认为false，必须与对等节点相同</ElCheckbox></div>
-		<div><ElCheckbox v-model="mainStore.config.multiThread">使用多线程运行时，默认为单线程</ElCheckbox></div>
-		<ElDivider />
-		<div><ElCheckbox v-model="mainStore.config.noTun">不创建TUN设备，可以使用子网代理访问节点</ElCheckbox></div>
-		<div><ElCheckbox v-model="mainStore.config.useSmoltcp">为子网代理启用smoltcp堆栈</ElCheckbox></div>
-		<div><ElCheckbox v-model="mainStore.config.latencyfirst">延迟优先模式，将尝试使用最低延迟路径转发流量，默认使用最短路径</ElCheckbox></div>
-		<div><ElCheckbox v-model="mainStore.config.disableUdpHolePunching">禁用UDP打洞功能</ElCheckbox></div>
-		<div>
-			<ElCheckbox v-model="mainStore.config.relayAllPeerrpc">转发所有对等节点的RPC数据包，即使对等节点不在转发网络白名单内</ElCheckbox>
-		</div>
 	</div>
 </template>
 <script setup lang="ts">
 	import useMainStore from "@/stores/index";
-	import { getCurrentWindow } from "@tauri-apps/api/window";
+	import { QuestionFilled } from "@element-plus/icons-vue";
 	import { resourceDir as getResourceDir, join } from "@tauri-apps/api/path";
 	import { Command } from "@tauri-apps/plugin-shell";
-	import { exists, mkdir, BaseDirectory } from "@tauri-apps/plugin-fs";
+	import { exists, mkdir, BaseDirectory, remove } from "@tauri-apps/plugin-fs";
+	import { ElMessage } from "element-plus";
+	import { reactive } from "vue";
+	import { dataSubscribe } from "@/composables/windows";
+	import { ATJ, supportProtocols } from "~/utils";
+	import CoreVersionWarning from "@/components/CoreVersionWarning.vue";
+	import { ElConfirmDanger } from "~/utils/element";
+
+	const protocols = supportProtocols();
+	const listenerDialogData = reactive<{ [key: string]: any }>({
+		visible: false,
+		loading: false
+	});
+
+	const handleListenerDialog = () => {
+		listenerDialogData.visible = true;
+	};
+
+	const handleFinishInputListener = async () => {
+		listenerDialogData.visible = false;
+	};

 	const mainStore = useMainStore();
-	const appWindow = getCurrentWindow();
 	const data = ["trace", "debug", "info", "warn", "error", "off"];
 	const openLogDir = async () => {
 		const resourceDir = await getResourceDir();
@@ -63,8 +263,40 @@
 		}
 		await Command.create("explorer", [logDirPath]).execute();
 	};
-	mainStore.$subscribe((...a) => {
-		// console.log("subscribe", a);
-		appWindow.emitTo("main", "config", { config: { ...mainStore.config } });
+	const openConfigJsonDir = async () => {
+		const resourceDir = await getResourceDir();
+		const easytierDir = await join(resourceDir, "easytier/");
+		const isExists = await exists("easytier/", { baseDir: BaseDirectory.Resource });
+		if (isExists) {
+			await Command.create("explorer", [easytierDir]).execute();
+		} else {
+			ElMessage.error("config.json的目录不存在");
+		}
+	};
+
+	dataSubscribe(async (...a) => {
+		if (!mainStore.createConfigInEasytier) {
+			// 考虑删除本地config.json文件
+			const configJsonPath = import.meta.env.VITE_CONFIG_FILE_NAME;
+			const isExists = await exists(configJsonPath, { baseDir: BaseDirectory.Resource });
+			// console.log({ isExists });
+			if (isExists) {
+				const [error, _] = await ElConfirmDanger("生成配置文件功能被关闭,是否删除本地config.json", "提示", {
+					confirmButtonText: "删除",
+					cancelButtonText: "保留"
+				});
+				if (!error) {
+					// 删除本地config.json文件
+					const [error, _] = await ATJ(remove(configJsonPath, { baseDir: BaseDirectory.Resource }));
+					if (error) {
+						ElMessage.error("删除失败，请打开目录手动删除");
+					}
+				}
+			}
+		}
+		return {
+			config: { ...mainStore.config },
+			createConfigInEasytier: mainStore.createConfigInEasytier
+		};
 	});
 </script>
@@ -1,6 +1,9 @@
 <template>
-	<div class="h-full flex flex-col gap-[10px]">
-		<ElRadioGroup v-model="mainStore.cidrEnable">
+	<div class="flex h-full flex-col gap-[10px]">
+		<ElRadioGroup
+			:disabled="!data.isSwitchEnable"
+			v-model="mainStore.cidrEnable"
+		>
 			<ElRadioButton :value="true">开启</ElRadioButton>
 			<ElRadioButton :value="false">关闭</ElRadioButton>
 		</ElRadioGroup>
@@ -9,17 +12,108 @@
 				placeholder="例如: 192.168.1.0/24 一行一个"
 				v-model="mainStore.config.proxyNetworks"
 				type="textarea"
-				:rows="30"
-				resize="none"></ElInput>
+				:rows="5"
+				resize="none"
+			></ElInput>
+			<ElTable
+				stripe
+				border
+				empty-text="暂无数据"
+				:data="data.route"
+				class="mt-[5px]"
+			>
+				<ElTableColumn
+					sortable
+					width="140"
+					label="主机名"
+					prop="hostname"
+				></ElTableColumn>
+				<ElTableColumn
+					width="120"
+					sortable
+					label="虚拟网IP"
+					prop="ipv4"
+				></ElTableColumn>
+				<ElTableColumn
+					sortable
+					label="被代理的子网"
+					prop="proxy_cidrs"
+				></ElTableColumn>
+			</ElTable>
 		</div>
 	</div>
 </template>
 <script setup lang="ts">
 	import useMainStore from "@/stores/index";
-    import { getCurrentWindow } from "@tauri-apps/api/window";
+	import { dataSubscribe } from "@/composables/windows";
+	import { invoke } from "@tauri-apps/api/core";
+	import { reactive, onMounted, onBeforeUnmount } from "vue";
+	import { ATJ, parseCliInfo } from "@/utils";
+	import { listen, type UnlistenFn } from "@tauri-apps/api/event";
 	const mainStore = useMainStore();
-	const appWindow = getCurrentWindow();
-	mainStore.$subscribe((...a) => {
-		appWindow.emitTo("main", "config", { cidrEnable: mainStore.cidrEnable, config: { ...mainStore.config } });
+
+	const data = reactive<{ [key: string]: any }>({
+		route: [],
+		isStart: false,
+		isSwitchEnable: false,
+		isRunning: false
+	});
+
+	const listenOutput = async () => {
+		data.isRunning = true;
+		const [error, member] = await ATJ(invoke<string>("get_route_by_cli"));
+		data.isRunning = false;
+		// if(!member) return;
+		if (error) {
+			data.route = [];
+			return "";
+		}
+		if (member === "_EasytierGameCliFailedToConnect_") {
+			data.route = [];
+			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;
+	};
+
+	const listenStart = async () => {
+		const unListen = await listen<boolean>("route", async event => {
+			data.isStart = event.payload;
+			if (data.isStart) {
+				data.isSwitchEnable = false;
+				if (mainStore.cidrEnable && !data.isRunning) {
+					await listenOutput();
+				} else {
+					data.route = [];
+				}
+			} else {
+				data.isSwitchEnable = true;
+				data.route = [];
+			}
+		});
+		return unListen;
+	};
+
+	let unlistenStart: UnlistenFn | null = null;
+
+	onMounted(async () => {
+		unlistenStart = await listenStart();
+	});
+
+	onBeforeUnmount(() => {
+		unlistenStart && unlistenStart();
+	});
+
+	dataSubscribe(async (...a) => {
+		return { cidrEnable: mainStore.cidrEnable, config: { ...mainStore.config } };
 	});
 </script>
@@ -16,8 +16,8 @@
 	});

 	const listenStart = async () => {
-		const unListen = await listen("logs", event => {
-			data.log = (event.payload as string) || "";
+		const unListen = await listen<string>("logs", event => {
+			data.log = event.payload || "";
 		});
 		return unListen;
 	};
@@ -1,31 +1,103 @@
 <template>
-	<div class="overflow-auto h-full">
+	<div class="h-full overflow-auto">
 		<div class="w-[1200px]">
-			<span v-if="!data.member || data.member.length <= 0">{{ "等待成员信息中..." }}</span>
+			<ElText
+				size="small"
+				v-if="!data.member || data.member.length <= 0"
+			>
+				{{ "等待成员信息中..." }}
+			</ElText>
 			<ElTable
 				stripe
 				border
 				:data="data.member"
-				v-else>
+				v-else
+			>
 				<ElTableColumn
-					v-for="prop in showTableHeader"
 					sortable
-					:prop="prop[0]"
-					:label="prop[1]"
-					:key="prop[0]">
+					width="140"
+					label="成员名"
+					prop="hostname"
+				>
+					<template #default="{ row }">
+						{{
+							(row.hostname || "").toLowerCase().includes("publicserver")
+								? (row.hostname || "").replace("PublicServer", "服务器")
+								: row.hostname || "-"
+						}}
+					</template>
+				</ElTableColumn>
+				<ElTableColumn
+					sortable
+					width="90"
+					prop="cost"
+					label="方式"
+				>
 					<template #default="{ row }">
-						<span v-if="prop[0] == 'loss_rate'">
-							{{ row[prop[0]] && row[prop[0]] != "-" ? Number(row[prop[0]] * 100).toFixed(2) + "%" : row[prop[0]] }}
-						</span>
-						<span v-else-if="prop[0] != 'cost'">{{ row[prop[0]] }}</span>
 						<ElTag
-							v-else
+							size="small"
 							effect="dark"
-							:type="row[prop[0]] == 'p2p' ? 'success' : 'info'">
-							{{ row[prop[0]] }}
+							:type="row.cost == 'p2p' ? 'success' : 'info'"
+						>
+							{{ row.cost ? row.cost.replace("relay", "中转") : row.cost }}
 						</ElTag>
 					</template>
 				</ElTableColumn>
+				<ElTableColumn
+					sortable
+					width="120"
+					prop="ipv4"
+					label="虚拟网IP"
+				></ElTableColumn>
+				<ElTableColumn
+					sortable
+					prop="lat_ms"
+					width="100"
+					label="延迟/ms"
+				></ElTableColumn>
+				<ElTableColumn
+					sortable
+					width="100"
+					prop="loss_rate"
+					label="丢包率"
+				>
+					<template #default="{ row }">
+						{{ row.loss_rate && row.loss_rate != "-" ? Number(row.loss_rate * 100).toFixed(2) + "%" : row.loss_rate }}
+					</template>
+				</ElTableColumn>
+				<ElTableColumn
+					sortable
+					width="110"
+					label="NAT类型"
+					prop="nat_type"
+				>
+					<template #default="{ row }">
+						{{ natMaps[row.nat_type.toLowerCase() as natKyes] || row.nat_type || "-" }}
+					</template>
+				</ElTableColumn>
+				<ElTableColumn
+					sortable
+					width="122"
+					prop="version"
+					label="版本"
+				></ElTableColumn>
+				<ElTableColumn
+					sortable
+					width="100"
+					prop="tunnel_proto"
+					label="隧道协议"
+				></ElTableColumn>
+				<ElTableColumn
+					sortable
+					width="90"
+					prop="rx_bytes"
+					label="接收"
+				></ElTableColumn>
+				<ElTableColumn
+					sortable
+					prop="tx_bytes"
+					label="传输"
+				></ElTableColumn>
 			</ElTable>
 		</div>
 	</div>
@@ -33,25 +105,79 @@
 <script setup lang="ts">
 	import { invoke } from "@tauri-apps/api/core";
 	import { reactive, onMounted, onBeforeUnmount } from "vue";
-	import { parsePeerInfo } from "@/utils";
-	const data = reactive<{ member: any[] }>({
-		member: [],
+	import { ATJ, parseCliInfo } from "@/utils";
+	import { ElConfirmDanger } from "~/utils/element";
+	import { getCurrentWindow } from "@tauri-apps/api/window";
+	// 	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;
+	// }
+	const natMaps = {
+		unknown: "未知",
+		OpenInternet: "nat0-openinternet",
+		nopat: "nat0-nopat",
+		fullcone: "nat1",
+		restricted: "nat2",
+		portrestricted: "nat3",
+		symmetric: "nat4",
+		symmetriceasydec: "nat4-easydec",
+		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: []
 	});

-	const showTableHeader = [
+	const _showTableHeader = [
 		["hostname", "主机名"],
-		["lat_ms", "延迟/ms"],
-		["ipv4", "虚拟网IP"],
 		["cost", "路由"],
+		["ipv4", "虚拟网IP"],
+		["lat_ms", "延迟/ms"],
 		["loss_rate", "丢包率"],
 		["nat_type", "NAT类型"],
 		["version", "版本"],
+		["tunnel_proto", "隧道协议"],
+		["rx_bytes", "接收"],
+		["tx_bytes", "传输"]
 	];

+	let timer: NodeJS.Timeout | null = null;
+
 	const listenOutput = async () => {
-		const member = await invoke("get_members_by_cli");
-		const peerInfo = parsePeerInfo(member as string);
-		peerInfo.forEach((value) => {
+		const [error, member] = await ATJ(invoke<string>("get_members_by_cli"));
+		// if(!member) return;
+		if (error) {
+			data.member = [];
+			return "";
+		}
+		if (member === "_EasytierGameCliFailedToConnect_") {
+			data.member = [];
+			stopTimer();
+			const [error] = await ElConfirmDanger("连接已断开,是否重新尝试?", "警告", {
+				confirmButtonText: "重试",
+				cancelButtonText: "关闭窗口"
+			});
+			if (!error) {
+				await listenOutput();
+			} else {
+				const appWindow = getCurrentWindow();
+				await appWindow.close();
+			}
+			return;
+		}
+		const peerInfo = parseCliInfo(member);
+		peerInfo.forEach(value => {
 			if (value.cost === "Local") {
 				value.cost = "本机";
 			}
@@ -59,20 +185,28 @@
 				value.ipv4 = value.ipv4.split("/")[0];
 			}
 		});
-		// console.log(peerInfo);
+		// console.log(peerInfo)
 		data.member = peerInfo;
+		startTimer();
 	};

-	let timer: NodeJS.Timeout | null = null;
+	const startTimer = () => {
+		timer && clearTimeout(timer);
+		timer = setTimeout(() => {
+			listenOutput();
+		}, 1000);
+	};
+
+	const stopTimer = () => {
+		timer && clearTimeout(timer);
+		timer = null;
+	};

 	onMounted(async () => {
-		listenOutput();
-		timer = setInterval(() => {
-			listenOutput();
-		}, 1000 * 10);
+		await listenOutput();
 	});

 	onBeforeUnmount(() => {
-		timer && clearInterval(timer);
+		stopTimer();
 	});
 </script>
@@ -0,0 +1,130 @@
+<template>
+	<div class="flex flex-col gap-[10px] h-full">
+		<ElForm
+			size="small"
+			label-position="top"
+			:model="mainStore.serverConfig"
+		>
+			<ElFormItem
+				label="白名单"
+				prop="ServerWhiteList"
+				class="full-label full-content overflow-hidden !flex flex-col h-full !mb-[0]"
+			>
+				<template #label>
+					<div class="flex items-center gap-[10px]">
+						白名单
+						<ElSwitch
+							v-model="mainStore.serverConfig.enableWhiteList"
+							inline-prompt
+							active-text="启用"
+							inactive-text="禁用"
+						></ElSwitch>
+
+						<div class="ml-auto">
+							<ElTooltip
+								placement="top"
+								content="打开软件的时候，就会开启这个自建服务"
+							>
+								<ElCheckbox v-model="mainStore.serverConfig.autoStart">自动启动</ElCheckbox>
+							</ElTooltip>
+							<ElTooltip
+								placement="top"
+								content="帮助其他虚拟网建立P2P链接"
+							>
+								<ElCheckbox v-model="mainStore.serverConfig.relayAllPeerrpc">转发所有对等节点的RPC数据包</ElCheckbox>
+							</ElTooltip>
+						</div>
+					</div>
+				</template>
+				<div class="h-full w-full flex flex-col overflow-hidden">
+					<div class="flex-1 overflow-auto">
+						<ElInput
+							:disabled="!mainStore.serverConfig.enableWhiteList"
+							placeholder="一行一个，支持通配符列表，如（ab*）。当该参数的列表为空时，就不会为所有其他网络提供转发服务。"
+							:maxlength="1000"
+							v-model="mainStore.serverConfig.serverWhiteList"
+							type="textarea"
+							:rows="3"
+							resize="none"
+						></ElInput>
+					</div>
+				</div>
+			</ElFormItem>
+		</ElForm>
+		<div class="flex items-center gap-[10px]">
+			<div class="flex items-center gap-[5px]">
+				<ElText>服务器端口</ElText>
+				<div class="max-w-[100px]">
+					<ElTooltip content="端口号">
+						<ElInput v-model="mainStore.serverConfig.port"></ElInput>
+					</ElTooltip>
+				</div>
+			</div>
+			<ElButton
+				size="large"
+				:loading="data.loading"
+				:type="data.isStart ? 'danger' : 'primary'"
+				@click="hanldeClickStart"
+			>
+				{{ !data.isStart ? "启动服务器" : "停止服务器" }}
+			</ElButton>
+		</div>
+
+		<ElInput
+			placeholder="服务器日志"
+			:model-value="data.log"
+			type="textarea"
+			:rows="14"
+			resize="none"
+		></ElInput>
+	</div>
+</template>
+<script setup lang="ts">
+	import useMainStore from "@/stores/index";
+	import { reactive, onMounted, onBeforeUnmount } from "vue";
+	import { getCurrentWindow } from "@tauri-apps/api/window";
+	import { listen, type UnlistenFn } from "@tauri-apps/api/event";
+	import { getServerArgs } from "@/composables/server";
+	import { dataSubscribe } from "@/composables/windows";
+
+    const appWindow = getCurrentWindow();
+	const mainStore = useMainStore();
+	const data = reactive({
+		log: "",
+		isStart: false,
+		loading: true
+	});
+
+	const listenStart = async () => {
+		const unListen = await listen<{ log: string; threadId: number | null }>("server_logs", event => {
+			data.log = event.payload.log || "";
+			if (event.payload.threadId) {
+				data.isStart = true;
+			} else {
+				data.isStart = false;
+			}
+			data.loading = false;
+		});
+		return unListen;
+	};
+
+	let unlistenStart: UnlistenFn | null = null;
+	onMounted(async () => {
+		unlistenStart = await listenStart();
+	});
+
+	onBeforeUnmount(() => {
+		unlistenStart && unlistenStart();
+	});
+
+	const hanldeClickStart = async () => {
+		data.loading = true;
+        const args = getServerArgs();
+		await appWindow.emitTo("main", "startStopServer", { args });
+	};
+
+	dataSubscribe(async (...a) => {
+		return { serverConfig: { ...mainStore.serverConfig }};
+	});
+
+</script>
@@ -8,7 +8,7 @@
 			<ElTabPane
 				label="联机失败解决办法"
 				name="netcard"
-				class="flex flex-col h-full"
+				class="flex h-full flex-col"
 			>
 				<div>
 					<div>
@@ -23,7 +23,7 @@
 						</ElTooltip>
 					</div>
 					<ElLink
-						class="!text-[15px] mr-[10px]"
+						class="mr-[10px] !text-[15px]"
 						type="info"
 						:underline="false"
 						@click="open('https://github.com/dechamps/WinIPBroadcast/releases/tag/winipbroadcast-1.6')"
@@ -41,14 +41,102 @@
 					></ElSwitch>
 				</div>
 				<div>
-					<ElTooltip content="设置网卡的跃点，提升网卡优先级，尝试将您联机使用的网卡跃点设置为最小，请先查询网卡信息">
+					<ElTooltip
+						content="使用ForceBindIP启动应用 (强制绑定IP或者网卡)，如果还有没启动联机，请先启动联机，联机成功后，点击刷新获取easytier生成的网卡"
+					>
 						<ElText>
 							方案2
 							<ElIcon class="ml-[3px]"><QuestionFilled /></ElIcon>
 						</ElText>
 					</ElTooltip>
 				</div>
-				<div class="flex items-center mt-[5px]">
+				<div>
+					<div>
+						<ElLink
+							class="!text-[15px]"
+							type="info"
+							:underline="false"
+							@click="open('https://r1ch.net/projects/forcebindip')"
+						>
+							ForceBindIP
+						</ElLink>
+					</div>
+					<div>
+						<ElRadioGroup
+							class="mr-[30px]"
+							v-model="mainStore.forceBindIpBit"
+						>
+							<ElRadio
+								label="32位"
+								value="32"
+							></ElRadio>
+							<ElRadio
+								label="64位"
+								value="64"
+							></ElRadio>
+						</ElRadioGroup>
+						<ElTooltip
+							placement="top"
+							content="如果目标应用程序在启动时崩溃或出现其他意外行为，请尝试开启它，ForceBindIP 加载程序将等待应用程序进入其消息循环后再注入拦截 DLL"
+						>
+							<ElCheckbox
+								v-model="mainStore.delayInjectDll"
+								label="延迟注入DLL"
+							></ElCheckbox>
+						</ElTooltip>
+					</div>
+					<div class="flex items-center gap-[5px]">
+						<ElSelect
+							placeholder="请输入IP地址或选择网卡"
+							v-model="mainStore.forceBindInput"
+							filterable
+							allow-create
+							no-data-text="暂无网卡数据，请尝试刷新"
+						>
+							<ElOption
+								v-for="guid in data.guids"
+								:key="guid[0]"
+								:label="guid[1]"
+								:value="guid[0]"
+							></ElOption>
+						</ElSelect>
+						<ElButton @click="getGuids">刷新</ElButton>
+					</div>
+					<div class="mt-[5px] flex items-center gap-[5px]">
+						<ElInput
+							placeholder="请选择或输入应用程序路径"
+							:disabled="data.forceBindStart"
+							v-model="mainStore.forceBindFile"
+						></ElInput>
+						<div class="flex items-center">
+							<ElButton
+								@click="handleBrowser"
+								:disabled="data.forceBindStart"
+							>
+								浏览
+							</ElButton>
+							<ElButton
+								:disabled="data.forceBindStart"
+								@click="startForceBindIp"
+								type="primary"
+							>
+								启动
+							</ElButton>
+						</div>
+					</div>
+				</div>
+				<div>
+					<!-- const guids = await invoke<string[]>("get_network_adapter_guids"); -->
+				</div>
+				<div>
+					<ElTooltip content="设置网卡的跃点，提升网卡优先级，尝试将您联机使用的网卡跃点设置为最小，请先查询网卡信息">
+						<ElText>
+							方案3
+							<ElIcon class="ml-[3px]"><QuestionFilled /></ElIcon>
+						</ElText>
+					</ElTooltip>
+				</div>
+				<div class="mt-[5px] flex items-center">
 					<ElButton
 						@click="initNetCardInfo"
 						size="small"
@@ -58,7 +146,7 @@
 					</ElButton>
 					<div
 						v-if="data.row.name"
-						class="ml-auto flex items-center flex-nowrap gap-[10px]"
+						class="ml-auto flex flex-nowrap items-center gap-[10px]"
 					>
 						<ElTooltip content="跃点越小，网卡优先级越高，范围(1-9999)">
 							<ElInput
@@ -78,7 +166,7 @@
 						</ElButton>
 					</div>
 				</div>
-				<div class="flex-1 overflow-auto mt-[5px]">
+				<div class="mt-[5px] flex-1 overflow-auto">
 					<ElTable
 						height="100%"
 						empty-text="暂无数据"
@@ -103,7 +191,7 @@
 			<ElTabPane
 				label="防火墙"
 				name="firewall"
-				class="flex flex-col h-full"
+				class="flex h-full flex-col"
 			>
 				<div class="flex flex-col items-center">
 					<div class="mb-[10px]">
@@ -113,6 +201,13 @@
 						>
 							一键关闭防火墙
 						</ElButton>
+						<ElButton
+							@click="handleCustomFireWall"
+							type="danger"
+							size="small"
+						>
+							自定义防火墙策略
+						</ElButton>
 					</div>
 					<div class="mb-[10px]">
 						<ElText class="!mx-[10px]">域防火墙</ElText>
@@ -144,7 +239,7 @@
 					<ElInputNumber
 						controls-position="right"
 						size="small"
-                        :precision="0"
+						:precision="0"
 						v-model="data.pingNum"
 						:min="1"
 						:max="10"
@@ -155,6 +250,7 @@
 					</ElInputNumber>
 					<ElButton
 						size="small"
+						:disabled="data.isPing"
 						@click="handleTestPing"
 					>
 						Ping一下
@@ -175,20 +271,25 @@
 </template>
 <script setup lang="ts">
 	import { open, Command } from "@tauri-apps/plugin-shell";
+	import { open as dialogOpen } from "@tauri-apps/plugin-dialog";
 	import { ElMessage, type TabPaneName } from "element-plus";
 	import { QuestionFilled } from "@element-plus/icons-vue";
 	import { onMounted, reactive } from "vue";
 	import useMainStore from "@/stores/index";
 	import { handleWinipBcStart, initStartWinIpBroadcast } from "@/composables/netcard";
-	import { getCurrentWindow } from "@tauri-apps/api/window";
+	import { isValidIP } from "~/utils";
+	import { dataSubscribe } from "~/composables/windows";
+	import { invoke } from "@tauri-apps/api/core";
+	import { BaseDirectory, exists } from "@tauri-apps/plugin-fs";

 	const mainStore = useMainStore();
-	const data = reactive({
+	const data = reactive<{ guids: string[][]; [key: string]: any }>({
 		activeTab: "netcard",
 		winipBcPid: 0,
 		pingNum: 1,
 		winipBcStart: false,
 		pingIp: "",
+		isPing: false,
 		pingLog: "",
 		firewallStatus: {
 			domain: false,
@@ -199,9 +300,15 @@
 			name: "",
 			metric: ""
 		},
-		netcardList: []
+		netcardList: [],
+		guids: [],
+		forceBindStart: false
 	});

+	const handleCustomFireWall = async () => {
+		await open("wf.msc");
+	}
+
 	const handleTabsChange = async (tabPaneName: TabPaneName) => {
 		if (tabPaneName === "netcard") {
 			// await initNetCardInfo();
@@ -223,33 +330,46 @@
 				ElMessage.success("设置成功");
 				await initNetCardInfo();
 			} catch (err) {
-				console.log(err);
+				console.error(err);
 			}
 		}
 	};

+	const awaitTime = (time: number) => {
+		return new Promise(res => {
+			setTimeout(res, time);
+		});
+	};
+
 	const handleTestPing = async () => {
-		/^((\d|[1-9]\d|1\d\d|2[0-4]\d|25[0-5])\.){3}(\d|[1-9]\d|1\d\d|2[0-4]\d|25[0-5])(?::(?:[0-9]|[1-9][0-9]{1,3}|[1-5][0-9]{4}|6[0-4][0-9]{3}|65[0-4][0-9]{2}|655[0-2][0-9]|6553[0-5]))?$/;
+		// const is = isValidIP(data.pingIp);
 		if (data.pingIp) {
 			data.pingLog = "";
+			data.isPing = true;
 			try {
 				for (let i = 0; i < data.pingNum; i++) {
 					const output = await Command.create("ping", ["-n", "1", data.pingIp], {
 						encoding: "gb2312"
 					}).execute();
-
-					data.pingLog = data.pingLog.slice(-1000);
 					if (output.stdout) {
-						data.pingLog += output.stdout.split("\n")[2];
+						data.pingLog += `${i + 1} - ${output.stdout.split("\n")[2]}`;
 					}
 					if (output.stderr) {
-						data.pingLog += output.stderr;
+						data.pingLog += `${i + 1}error - ${output.stderr}`;
+					}
+					if (i != data.pingNum - 1) {
+						await awaitTime(1000);
 					}
 				}
+				data.pingLog += "完毕";
 			} catch (err) {
 				ElMessage.error("Ping发生错误");
-				console.log(err);
+				console.error(err);
+			} finally {
+				data.isPing = false;
 			}
+		} else {
+			ElMessage.error("请输入正确的IP");
 		}
 	};

@@ -275,7 +395,7 @@
 				}) as any;
 		} catch (err) {
 			ElMessage.error("网卡获取失败");
-			console.log(err);
+			console.error(err);
 		}
 	};

@@ -306,18 +426,84 @@
 				}
 			}
 		} catch (err) {
+			// netsh advfirewall firewall add rule name="EXE名称" dir=out action=allow program="EXE绝对路径"
 			ElMessage.error("获取防火墙状态失败");
-			console.log(err);
+			console.error(err);
 		}
 	};

-	const appWindow = getCurrentWindow();
-	mainStore.$subscribe((...a) => {
-		// console.log("subscribe", a);
-		appWindow.emitTo("main", "config", { winIpBcAutoStart: mainStore.winIpBcAutoStart, config: { ...mainStore.config } });
+	const handleBrowser = async () => {
+		const file = await dialogOpen({
+			multiple: false,
+			directory: false
+		});
+		if (file) {
+			mainStore.forceBindFile = file;
+		} else {
+			ElMessage.error("获取文件路径失败");
+		}
+	};
+
+	const startForceBindIp = async () => {
+		if (!mainStore.forceBindInput) {
+			return ElMessage.error("请输入IP地址或者选择一个网卡");
+		}
+		if (!mainStore.forceBindFile) {
+			return ElMessage.error("请选择一个执行文件");
+		}
+
+		const forceBindIpExe = mainStore.forceBindIpBit == "32" ? "ForceBindIP" : "ForceBindIP64";
+		const isExists = await exists(`easytier/tool/${forceBindIpExe}.exe`, { baseDir: BaseDirectory.Resource });
+		if (!isExists) {
+			return ElMessage.error("forcebindIP文件不存在");
+		}
+
+		data.forceBindStart = true;
+		try {
+			const dealyDll = mainStore.delayInjectDll ? "-i" : "";
+			const child = await Command.create(
+				forceBindIpExe,
+				[dealyDll, mainStore.forceBindInput, mainStore.forceBindFile.replace(/\//g, "\\")].filter(el => el),
+				{
+					encoding: "gb2312"
+				}
+			).spawn();
+			// console.log({child});
+		} catch (err) {
+			ElMessage.error("forcebindIP启动发生未知错误");
+			console.error(err);
+		} finally {
+			data.forceBindStart = false;
+		}
+	};
+
+	dataSubscribe(async (...a) => {
+		return {
+			winIpBcAutoStart: mainStore.winIpBcAutoStart,
+			winipBcStart: mainStore.winipBcStart,
+			winipBcPid: mainStore.winipBcPid,
+			forceBindIpBit: mainStore.forceBindIpBit,
+			delayInjectDll: mainStore.delayInjectDll,
+			forceBindInput: mainStore.forceBindInput,
+			forceBindFile: mainStore.forceBindFile,
+			config: { ...mainStore.config }
+		};
 	});

+	const getGuids = async () => {
+		const guids = await invoke<string[][]>("get_network_adapter_guids");
+		data.guids = guids && guids.length > 0 ? guids : [];
+		if (mainStore.forceBindInput.startsWith("{")) {
+			const has = data.guids.find(el => el[0] == mainStore.forceBindInput);
+			if (!has) {
+				mainStore.forceBindInput = "";
+			}
+		}
+	};
+
 	onMounted(() => {
+		data.pingIp = mainStore.config.ipv4;
 		initStartWinIpBroadcast();
+		getGuids();
 	});
 </script>
@@ -1,10 +0,0 @@
-import { createPersistedState } from "pinia-plugin-persistedstate";
-import { defineNuxtPlugin } from "nuxt/app";
-export default defineNuxtPlugin((nuxtApp: any) => {
-	nuxtApp.$pinia.use(
-		createPersistedState({
-			storage: localStorage,
-			key: id => `__glj_persisted_${id}`
-		})
-	);
-});
@@ -2,4 +2,5 @@
 # will have compiled files and executables
 /target/
 /gen/schemas
-/easytier/
+/easytier/logs
+/easytier/logs/*.*
@@ -1,6 +1,6 @@
 [package]
 name = "easytier-game"
-version = "1.1.6"
+version = "1.3.7"
 homepage = "https://github.com/EasyTier/EasyTier"
 repository = "https://github.com/EasyTier/EasytierGame"
 description = "A simple network initiator based on Easytier"
@@ -8,7 +8,7 @@ authors = ["leizi97"]
 license = "LICENSE"

 edition = "2021"
-rust-version = "1.77.2"
+# rust-version = "1.77.2"

 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

@@ -18,35 +18,41 @@ name = "app_lib"
 crate-type = ["staticlib", "cdylib", "rlib"]

 [build-dependencies]
-tauri-build = { version = "2.0.2", features = [] }
+tauri-build = { version = "2.0.5", features = [] }
 # prost-build = "0.13.2"

 [dependencies]
-serde_json = "1.0"
-serde = { version = "1.0", features = ["derive"] }
-log = "0.4"
-tauri = { version = "2.0.6", features = [
+serde_json = "1.0.135"
+serde = { version = "1.0.217", features = ["derive"] }
+log = "0.4.25"
+tauri = { version = "2.2.2", features = [
    "tray-icon",
    "image-png",
    "image-ico",
+    "devtools"
 ] }

-tauri-plugin-log = "2.0.1"
-tauri-plugin-shell = "2.0.2"
-reqwest = { version = "0.12", features = ["json"] }
-zip = "2.2.0"
-sysinfo = '0.32.0'
+tauri-plugin-log = "2.2.0"
+tauri-plugin-shell = "2.2.0"
+reqwest = { version = "0.12.12", features = ["json"] }
+zip = "2.2.2"
+sysinfo = '0.33.1'
 planif = { git = "https://github.com/mattrobineau/planif", tag = "1.0.1" }
 whoami = "1.5.2"
-tauri-plugin-fs = "2"
-tauri-plugin-clipboard-manager = "2.0.0-rc"
+tauri-plugin-fs = "2.2.0"
+tauri-plugin-clipboard-manager = "2.2.0"
+rand = "0.8.5"
+tokio = { version = "1.43.0", features = ["process"] }
+tauri-plugin-dialog = "2.2.0"
 # prost = "0.13"
 # prost-types = "0.13"
+hashbrown = "0.15.2"

 [dependencies.windows]
 version = "0.58.0"
-features = ["Win32_System_TaskScheduler"]
+features = ["Win32_System_TaskScheduler", "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-autostart = "2.0.1"
-tauri-plugin-single-instance = "2.0.1"
+tauri-plugin-cli = "2.2.0"
+tauri-plugin-single-instance = "2.2.1"
+tauri-plugin-window-state = "2.2.0"
@@ -1,91 +1,115 @@
 {
-  "$schema": "../gen/schemas/desktop-schema.json",
-  "identifier": "default",
-  "description": "enables the default permissions",
-  "windows": [
-    "main",
-    "log",
-    "member",
-    "cidr",
-    "advance",
-    "tool"
-  ],
-  "permissions": [
-    "core:default",
-    "core:window:allow-minimize",
-    "core:window:allow-hide",
-    "core:window:allow-close",
-    "shell:allow-open",
-    "core:window:allow-show",
-    "core:window:allow-create",
-    "core:window:allow-set-position",
-    "core:window:allow-destroy",
-    "core:webview:allow-create-webview-window",
-    "core:webview:allow-set-webview-size",
-    "core:webview:allow-set-webview-position",
-    "core:webview:allow-create-webview",
-    "core:webview:allow-webview-show",
-    "core:webview:allow-webview-hide",
-    "core:webview:allow-webview-close",
-    "autostart:default",
-    "autostart:allow-enable",
-    "autostart:allow-disable",
-    "autostart:allow-is-enabled",
-    "core:tray:allow-get-by-id",
-    "core:tray:allow-set-icon",
-    "core:tray:allow-new",
-    {
-      "identifier": "shell:allow-spawn",
-      "allow": [
-        {
-          "args": [
-            "run"
-          ],
-          "cmd": "easytier/tool/WinIPBroadcast",
-          "name": "WinIPBroadcast"
-        }
-      ]
-    },
-    {
-      "identifier": "shell:allow-execute",
-      "allow": [
-        {
-          "args": [
-            "run"
-          ],
-          "cmd": "easytier/tool/WinIPBroadcast",
-          "name": "WinIPBroadcast"
-        },
-        {
-          "args": true,
-          "cmd": "easytier/tool/nssm",
-          "name": "nssm"
-        },
-        {
-          "args": true,
-          "cmd": "explorer",
-          "name": "explorer"
-        },
-        {
-          "args": true,
-          "cmd": "netsh",
-          "name": "netsh"
-        },
-        {
-          "args": true,
-          "cmd": "ping",
-          "name": "ping"
-        }
-      ]
-    },
-    "fs:default",
-    "fs:allow-read-dir",
-    "fs:allow-exists",
-    "fs:allow-open",
-    "fs:allow-resource-read",
-    "fs:allow-resource-read-recursive",
-    "clipboard-manager:allow-clear",
-    "clipboard-manager:allow-read-text",
-    "clipboard-manager:allow-write-text"
-  ]
-}
+	"$schema": "../gen/schemas/desktop-schema.json",
+	"identifier": "default",
+	"description": "enables the default permissions",
+	"windows": ["main", "log", "member", "cidr", "advance", "tool", "server"],
+	"permissions": [
+		"core:default",
+		"core:window:allow-minimize",
+		"core:window:allow-unminimize",
+		"core:window:allow-hide",
+		"core:window:allow-close",
+		"core:window:allow-set-focus",
+		"core:window:allow-is-visible",
+		"shell:allow-open",
+		"core:window:allow-show",
+		"core:window:allow-create",
+		"core:window:allow-set-position",
+		"core:window:allow-destroy",
+		"core:webview:allow-create-webview-window",
+		"core:webview:allow-set-webview-size",
+		"core:webview:allow-set-webview-position",
+		"core:webview:allow-create-webview",
+		"core:webview:allow-webview-show",
+		"core:webview:allow-webview-hide",
+		"core:webview:allow-webview-close",
+		"core:tray:allow-get-by-id",
+		"core:tray:allow-set-icon",
+		"core:tray:allow-new",
+		{
+			"identifier": "shell:allow-spawn",
+			"allow": [
+				{
+					"args": ["run"],
+					"cmd": "$RESOURCE/easytier/tool/WinIPBroadcast",
+					"name": "WinIPBroadcast"
+				},
+				{
+					"args": true,
+					"cmd": "$RESOURCE/easytier/tool/ForceBindIP",
+					"name": "ForceBindIP"
+				},
+				{
+					"args": true,
+					"cmd": "$RESOURCE/easytier/tool/ForceBindIP64",
+					"name": "ForceBindIP64"
+				}
+			]
+		},
+		{
+			"identifier": "shell:allow-execute",
+			"allow": [
+				{
+					"args": ["run"],
+					"cmd": "$RESOURCE/easytier/tool/WinIPBroadcast",
+					"name": "WinIPBroadcast"
+				},
+				{
+					"args": true,
+					"cmd": "$RESOURCE/easytier/tool/ForceBindIP",
+					"name": "ForceBindIP"
+				},
+				{
+					"args": true,
+					"cmd": "$RESOURCE/easytier/tool/ForceBindIP64",
+					"name": "ForceBindIP64"
+				},
+				{
+					"args": true,
+					"cmd": "$RESOURCE/easytier/tool/nssm",
+					"name": "nssm"
+				},
+				{
+					"args": true,
+					"cmd": "explorer",
+					"name": "explorer"
+				},
+				{
+					"args": true,
+					"cmd": "wf.msc",
+					"name": "wf.msc"
+				},
+				{
+					"args": true,
+					"cmd": "netsh",
+					"name": "netsh"
+				},
+				{
+					"args": true,
+					"cmd": "ping",
+					"name": "ping"
+				}
+			]
+		},
+		"fs:default",
+		"fs:allow-read-dir",
+		"fs:allow-exists",
+		"fs:allow-open",
+		"fs:allow-resource-read",
+		"fs:allow-resource-read-recursive",
+		"fs:allow-resource-write",
+		"fs:allow-resource-write-recursive",
+		"clipboard-manager:allow-clear",
+		"clipboard-manager:allow-read-text",
+		"clipboard-manager:allow-write-text",
+		"window-state:default",
+		"window-state:allow-save-window-state",
+		"window-state:allow-restore-state",
+		"cli:default",
+		"cli:allow-cli-matches",
+		"log:default",
+		"log:allow-log",
+		"dialog:default",
+		"dialog:allow-open"
+	]
+}
@@ -0,0 +1,57 @@
+@echo off
+chcp 65001 >nul
+setlocal
+
+REM 检查是否具有管理员权限
+openfiles >nul 2>&1
+if %errorlevel% neq 0 (
+    echo 当前没有管理员权限，鼠标右键clear_data.bat，选择使用管理员模式运行...
+    pause
+    exit /b
+)
+
+REM 获取当前用户的 Local 目录路径
+set "local_dir=%LOCALAPPDATA%"
+
+REM 设置要删除的任务计划程序文件夹名称
+set "folder_name=\easytierGame"
+set "task_name=auto start"
+
+REM 设置要删除的目标文件夹
+set "target_data_dir=%local_dir%\com.tauri.easytier-game"
+echo ---
+REM 打印 Local 目录路径
+echo 当前数据目录: %target_data_dir%
+echo ---
+echo 您确定要清除EasytierGame的本地数据吗? (y/n)
+echo ---
+
+REM 等待用户输入
+set /p confirm=输入'y/n'进行确认:
+
+if /i "%confirm%"=="y" (
+    echo 清除数据中,请稍后...
+    echo ---
+    @REM REM 删除任务计划程序文件夹
+    echo delete auto_start task ...
+    echo ---
+
+    echo ---
+    schtasks /delete /tn "%folder_name%\%task_name%" /f
+    schtasks /delete /tn "%folder_name%" /f
+    echo ---
+    echo 开始清除本地缓存数据，没有使用开机自启上面就会报错，不影响数据清理...
+
+    if exist "%target_data_dir%" (
+        REM 删除目标文件夹及其内容
+        rd /s /q "%target_data_dir%"
+    )
+    echo 清除本地缓存数据完毕.
+    echo ---
+    echo 您可以手动删除EasytierGame目录下所有文件，即可完成卸载.
+) else (
+    echo 取消清理数据
+)
+
+pause
+endlocal
@@ -0,0 +1,77 @@
+# 实例名称，用于在同一台机器上标识此节点
+instance_name = ""
+# 主机名，用于标识此设备的主机名
+hostname = ""
+# 实例 ID，一般为 UUID，在同一个虚拟网络中唯一
+instance_id = ""
+# 此节点的虚拟网 IPv4 地址，如果为空，则此节点将仅转发数据包，不会创建 TUN 设备
+ipv4 = ""
+# 由 Easytier 自动确定并设置IP地址，默认从10.0.0.1开始。警告：在使用 DHCP 时，如果网络中出现 IP 冲突，IP 将自动更改
+dhcp = false
+
+# 监听器列表，用于接受连接
+listeners = [
+"tcp://0.0.0.0:11010",
+"udp://0.0.0.0:11010",
+"wg://0.0.0.0:11011",
+"ws://0.0.0.0:11011/",
+"wss://0.0.0.0:11012/",
+]
+
+# 退出节点列表
+exit_nodes = [
+]
+
+# 用于管理的 RPC 门户地址
+rpc_portal = "127.0.0.1:15888"
+
+[network_identity]
+# 网络名称，用于标识虚拟网络
+network_name = ""
+# 网络密钥，用于验证此节点属于虚拟网络
+network_secret = ""
+
+# 这里是对等连接节点配置，可以多段配置
+[[peer]]
+uri = "tcp://public.easytier.top:11010"
+
+[[peer]]
+uri = "udp://public.easytier.top:11010"
+
+# 这里是子网代理节点配置，可以有多段配置
+[[proxy_network]]
+cidr = "10.0.1.0/24"
+
+[[proxy_network]]
+cidr = "10.0.2.0/24"
+
+# WireGuard 配置信息
+[vpn_portal_config]
+# WireGuard 客户端所在的网段，下面为示例
+client_cidr = "10.14.14.0/24"
+#wg所监听的端口(请勿和listeners的wg冲突)
+wireguard_listen = "0.0.0.0:11012"
+
+[flags]
+# 连接到对等节点使用的默认协议
+default_protocol = "tcp"
+# TUN 设备名称，如果为空，则使用默认名称
+dev_name = ""
+# 禁用p2p
+disable_p2p = false
+# 是否启用加密
+enable_encryption = true
+# 是否启用 IPv6 支持
+enable_ipv6 = true
+# TUN 设备的 MTU
+mtu = 1380
+# 延迟优先模式，将尝试使用最低延迟路径转发流量，默认使用最短路径
+latency_first = false
+# 将本节点配置为退出节点
+enable_exit_node = false
+# 禁用 TUN 设备
+no_tun = false
+# 为子网代理启用 smoltcp 堆栈
+use_smoltcp = false
+# 仅转发白名单网络的流量，支持通配符字符串。多个网络名称间可以使用英文空格间隔。如果该参数为空，则禁用转发。默认允许所有网络。例如：'*'（所有网络），'def*'（以def为前缀的网络），'net1 net2'（只允许net1和net2）
+foreign_network_whitelist = "*"
@@ -1,23 +0,0 @@
-hostname = "Test1"
-instance_name = "default"
-instance_id = "8803362c-e4f1-4df1-93e8-721653945f77"
-dhcp = true
-listeners = [
-    "tcp://0.0.0.0:11010",
-    "udp://0.0.0.0:11010",
-    "wg://0.0.0.0:11011",
-    "ws://0.0.0.0:11011/",
-    "wss://0.0.0.0:11012/",
-]
-exit_nodes = []
-rpc_portal = "0.0.0.0:15888"
-
-[network_identity]
-network_name = "default"
-network_secret = ""
-
-[[peer]]
-uri = "tcp://public.easytier.top:11010"
-
-[[peer]]
-uri = "udp://public.easytier.top:11010"
@@ -0,0 +1,28 @@
+{
+    // 如果您的配置过于复杂，可以参考 使用配置文件进行联机的办法，以下是基础的界面配置，用于快速分享联机
+    "protocol": [
+        "tcp",
+        "udp"
+    ], // 协议类型
+    
+    // easytier服务地址 - 可填写多个 方式1，逗号分隔，"xxxx.cn,yyyy.com" 方式2,数组 ["xxxx.cn","yyyy.com"] （默认选中第一个）
+    "serverUrl": "public.easytier.top:11010", 
+    "networkName": "",  // 网络名
+    "networkPassword": "", // 网络密码
+    "hostname": "configTest", // 主机名
+    "ipv4": "10.126.126.1", // IP地址(选填，下面有dhcp)
+    "disableIpv6": false, // 禁用ipv6
+    "disbleListenner": true, // 禁用端口监听
+    "disableEncryption": false, // 禁用加密
+    "noTun": false, // 禁用tun
+    "latencyfirst": false, // 延迟优先
+    "disableUdpHolePunching": false, // 禁用udp打洞
+    "disbleP2p": false,  // 禁用p2p, 强制中转
+    "dhcp": false,  // 动态分配IP
+    "devName": false, // 是否启用自定义网卡名
+    "devNameValue": "", // 网卡名(启用devName之后才生效)
+    "enableCustonProtocol": false,  // 是否启用自定义协议
+    "customProtocol": "tcp", // 自定义协议类型
+    "enableNetCardMetric": false,  // 自定义easytier每次生成的网卡跃点
+    "netCardMetricValue": 1 // 网卡跃点数量(1-9999)
+}
@@ -9,20 +9,117 @@ use std::fs::{self, File};
 use std::io::{BufRead, BufReader, Write};
 use std::os::windows::process::CommandExt;
 use std::process::{Command, Stdio};
-use std::sync::{
-    atomic::{AtomicBool, Ordering},
-    mpsc, Arc,
-};
+use std::ptr;
+use std::sync::mpsc;
 use std::{path, thread};
 use sysinfo::System;
 use tauri::tray::{MouseButton, MouseButtonState, TrayIconBuilder, TrayIconEvent};
 use tauri::Emitter;
 use tauri::Manager;
-use tauri_plugin_autostart::MacosLauncher;
 use windows::core::{BSTR, VARIANT};
 use windows::Win32::Foundation::VARIANT_BOOL;
+use windows::Win32::NetworkManagement::IpHelper::{
+    GetAdaptersAddresses, GAA_FLAG_INCLUDE_PREFIX, IP_ADAPTER_ADDRESSES_LH,
+};
+use windows::Win32::Networking::WinSock::AF_UNSPEC;
 use windows::Win32::System::Com::*;
 use windows::Win32::System::TaskScheduler::*;
+// use std::ffi::CStr;
+
+use windows::Win32::System::Power::SetThreadExecutionState;
+use windows::Win32::System::Power::{
+    ES_CONTINUOUS, ES_DISPLAY_REQUIRED, ES_SYSTEM_REQUIRED, EXECUTION_STATE,
+};
+
+use rand::Rng;
+use tokio::process::Command as tokioCommand;
+
+#[tauri::command(rename_all = "snake_case")]
+fn get_network_adapter_guids() -> Vec<[String; 2]> {
+    let mut guids: Vec<[String; 2]> = Vec::new();
+    unsafe {
+        let mut buffer_length: u32 = 0;
+        let mut result = GetAdaptersAddresses(
+            AF_UNSPEC.0.into(),
+            GAA_FLAG_INCLUDE_PREFIX,
+            Some(ptr::null_mut()),
+            Some(ptr::null_mut()),
+            &mut buffer_length,
+        );
+
+        if result != 0 {
+            let mut buffer: Vec<u8> = vec![0; buffer_length as usize];
+            let adapter_addresses: *mut IP_ADAPTER_ADDRESSES_LH = buffer.as_mut_ptr() as *mut _;
+
+            result = GetAdaptersAddresses(
+                AF_UNSPEC.0.into(),
+                GAA_FLAG_INCLUDE_PREFIX,
+                Some(ptr::null_mut()),
+                Some(adapter_addresses),
+                &mut buffer_length,
+            );
+
+            if result == 0 {
+                let mut current_address = adapter_addresses;
+
+                while !current_address.is_null() {
+                    let adapter = &*current_address;
+
+                    let guid = adapter.AdapterName.to_string().unwrap();
+                    let desc = adapter.Description.to_string().unwrap();
+                    guids.push([guid, desc]);
+
+                    current_address = adapter.Next;
+                }
+            } else {
+                log::error!("GetAdaptersAddresses failed with error");
+            }
+        } else {
+            log::error!("GetAdaptersAddresses failed to retrieve buffer length with error");
+        }
+    }
+
+    return guids;
+}
+
+fn generate_random_user_agent() -> String {
+    let user_agents = vec![
+        "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/{version} Safari/537.36",
+        "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/{version} Safari/605.1.15",
+        "Mozilla/5.0 (iPhone; CPU iPhone OS 14_0 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/{version} Mobile/15E148 Safari/604.1",
+        "Mozilla/5.0 (Linux; Android 10; SM-G973F) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/{version} Mobile Safari/537.36",
+        "Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:{version}) Gecko/20100101 Firefox/{version}",
+    ];
+
+    let mut rng = rand::thread_rng();
+    let template = user_agents[rng.gen_range(0..user_agents.len())];
+
+    // 生成随机版本号
+    let version_major: u8 = rng.gen_range(70..90);
+    let version_minor: u8 = rng.gen_range(0..10);
+    let version_patch: u8 = rng.gen_range(0..10);
+    let version = format!("{}.{}.{}", version_major, version_minor, version_patch);
+
+    // 替换模板中的版本号占位符
+    template.replace("{version}", &version)
+}
+
+#[tauri::command(rename_all = "snake_case")]
+fn prevent_sleep() -> bool {
+    unsafe {
+        let result =
+            SetThreadExecutionState(ES_SYSTEM_REQUIRED | ES_DISPLAY_REQUIRED | ES_CONTINUOUS);
+        result != EXECUTION_STATE(0)
+    }
+}
+
+#[tauri::command(rename_all = "snake_case")]
+fn allow_sleep() -> bool {
+    unsafe {
+        let result = SetThreadExecutionState(ES_CONTINUOUS);
+        result != EXECUTION_STATE(0)
+    }
+}

 // 定义GitHub Release的结构体
 #[derive(Debug, Deserialize)]
@@ -47,11 +144,11 @@ pub async fn fetch_releases() -> Result<Vec<Release>, Error> {
    let client = Client::new();
    // 构建请求的URL
    let url = format!("https://api.github.com/repos/easytier/easytier/releases",);
-
+    let user_agent = generate_random_user_agent();
    // 发送HTTP GET请求
    let response = client
        .get(&url)
-        .header("User-Agent", "Tauri-fetch")
+        .header("User-Agent", user_agent)
        .send()
        .await?;
    // 反序列化响应体为Release列表
@@ -59,23 +156,50 @@ pub async fn fetch_releases() -> Result<Vec<Release>, Error> {
 }

 #[tauri::command(rename_all = "snake_case")]
-fn get_core_version() -> String {
-    match Command::new("easytier/easytier-core.exe")
-        .arg("--version")
-        .creation_flags(0x08000000)
-        .output()
+async fn fetch_game_releases() -> [String; 2] {
+    // 创建HTTP客户端
+    let client = Client::new();
+    // 构建请求的URL
+    let url = format!("https://api.github.com/repos/Easytier/EasytierGame/releases",);
+    let user_agent = generate_random_user_agent();
+    // 发送HTTP GET请求
+    if let Ok(response) = client
+        .get(&url)
+        .header("User-Agent", user_agent)
+        .send()
+        .await
    {
-        Ok(output) => {
-            let output_str = String::from_utf8_lossy(&output.stdout);
-            return output_str.trim().to_string();
+        // 反序列化响应体为Release列表
+        match response.json::<Vec<Release>>().await {
+            Ok(releases) => {
+                if releases.len() <= 0 {
+                    return [String::from(""), String::from("")];
+                }
+                let release = releases.first().unwrap();
+                let tag_name = release.tag_name.as_str();
+                let browser_download_url = release
+                    .assets
+                    .first()
+                    .unwrap()
+                    .browser_download_url
+                    .as_str();
+                [String::from(tag_name), String::from(browser_download_url)]
+            }
+            Err(_e) => {
+                log::error!("game release {}", _e.to_string());
+                [String::from(""), String::from("")]
+            }
        }
-        Err(_e) => return "".to_string(),
+    } else {
+        log::error!("failed to get game release");
+        [String::from(""), String::from("")]
    }
 }

 #[tauri::command(rename_all = "snake_case")]
-fn get_cli_version() -> String {
-    match Command::new("easytier/easytier-cli.exe")
+fn get_core_version() -> String {
+    let core_path = get_tool_exe_path("\\easytier\\easytier-core.exe");
+    match Command::new(&core_path)
        .arg("--version")
        .creation_flags(0x08000000)
        .output()
@@ -84,10 +208,37 @@ fn get_cli_version() -> String {
            let output_str = String::from_utf8_lossy(&output.stdout);
            return output_str.trim().to_string();
        }
-        Err(_e) => return "".to_string(),
+        Err(_e) => {
+            log::error!("{}", _e.to_string());
+            return "".to_string();
+        }
    }
 }

+// #[tauri::command(rename_all = "snake_case")]
+// #[warn(dead_code)]
+// fn get_cli_version() -> String {
+//     let cli_path = get_tool_exe_path("\\easytier\\easytier-cli.exe");
+//     match Command::new(&cli_path)
+//         .arg("--version")
+//         .creation_flags(0x08000000)
+//         .output()
+//     {
+//         Ok(output) => {
+//             let output_str = String::from_utf8_lossy(&output.stdout);
+//             return output_str.trim().to_string();
+//         }
+//         Err(_e) => return "".to_string(),
+//     }
+// }
+
+fn get_tool_exe_path(path: &str) -> String {
+    let cur_vec = get_exe_directory();
+    let tool_path = format!("{}{}", cur_vec[1].as_str(), path);
+    // log::error!("tool path: {}", tool_path);
+    return tool_path;
+}
+
 #[derive(Serialize, Deserialize, Debug)]
 struct RoutePeerInfo {
    peer_id: u64,
@@ -121,35 +272,83 @@ struct MyResponse {
 }

 #[tauri::command(rename_all = "snake_case")]
-fn get_members_by_cli() -> String {
-    match Command::new("easytier/easytier-cli.exe")
+async fn get_members_by_cli() -> String {
+    let cli_path = get_tool_exe_path("\\easytier\\easytier-cli.exe");
+    match tokioCommand::new(&cli_path)
        .arg("peer")
        .arg("list")
        .creation_flags(0x08000000)
        .output()
+        .await
    {
        Ok(output) => {
-            let output_str = String::from_utf8_lossy(&output.stdout);
-            return output_str.trim().to_string();
+            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 "_EasytierGameCliFailedToConnect_".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("route")
+        .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 "_EasytierGameCliFailedToConnect_".to_string();
+            }
+        }
+        Err(_e) => {
+            log::error!("get route list error");
+            return "".to_string();
        }
-        Err(_e) => return _e.to_string(),
    }
 }

 #[tauri::command(rename_all = "snake_case")]
 async fn download_easytier_zip(download_url: String, file_name: String) {
+    let cache_dir_path = get_tool_exe_path("\\easytier\\cache");
+    let cache_file_name = format!("{}\\{}", cache_dir_path, file_name);
+    let cache_file_name_path = path::Path::new(&cache_file_name);
+    if cache_file_name_path.exists() {
+        unzip(cache_file_name_path);
+        return;
+    }
+
    let target = format!("{}", download_url);
    let response = reqwest::get(target)
        .await
        .expect("error to download easytier url");
-    let file_path = format!("./easytier/{}", file_name);
+    let easytier_path = get_tool_exe_path("\\easytier");
+    let file_path = format!("{}\\{}", easytier_path, file_name);
+    println!("download easytier to {}", file_path);

-    let easytier_dir = path::Path::new("./easytier");
+    let easytier_dir = path::Path::new(&easytier_path);
    if !easytier_dir.exists() {
        fs::create_dir_all(&easytier_dir).unwrap();
    }

    let path = path::Path::new(&file_path);
+    println!("download easytier to {}", path.display());

    let mut file = match File::create(&path) {
        Err(why) => panic!("couldn't create {}", why),
@@ -161,10 +360,19 @@ async fn download_easytier_zip(download_url: String, file_name: String) {
    file.write_all(&content).expect("error to write easytier");
    println!("写入完成");
    unzip(path);
-    match fs::remove_file(path) {
-        Ok(_) => println!("删除zip文件成功"),
-        Err(_) => println!("删除zip文件失败"),
+
+    let cache_dir_path = path::Path::new(&cache_dir_path);
+    if !cache_dir_path.exists() {
+        fs::create_dir_all(&cache_dir_path).unwrap();
    }
+    match fs::rename(path, cache_file_name) {
+        Ok(_) => println!("保存zip文件至easytier/cache成功"),
+        Err(_) => log::error!("保存zip文件失败"),
+    }
+    // match fs::remove_file(path) {
+    //     Ok(_) => println!("删除zip文件成功"),
+    //     Err(_) => log::error!("删除zip文件失败"),
+    // }
 }

 fn unzip(fname: &path::Path) {
@@ -197,8 +405,8 @@ fn unzip(fname: &path::Path) {
        //         fs::create_dir_all(p).unwrap();
        //     }
        // }
-
-        let easytier_dir = path::Path::new("./easytier");
+        let easytier_path = get_tool_exe_path("\\easytier");
+        let easytier_dir = path::Path::new(&easytier_path);
        // if !easytier_dir.exists() {
        //     fs::create_dir_all(&easytier_dir).unwrap();
        // }
@@ -212,21 +420,26 @@ fn unzip(fname: &path::Path) {
 }

 #[tauri::command(rename_all = "snake_case")]
-fn run_command(
-    app_handle: tauri::AppHandle,
-    args: Vec<String>,
-    stop_signal: tauri::State<Arc<AtomicBool>>,
-) {
+fn run_command(app_handle: tauri::AppHandle, args: Vec<String>, is_server: Option<bool>) {
+    let is_server = is_server.unwrap_or(false);
    let (tx, rx) = mpsc::channel();
-    stop_signal.store(false, Ordering::Relaxed);
+
    let app_handle1 = app_handle.clone();
    let app_handle2 = app_handle.clone();
-    let stop_signal1 = Arc::clone(&stop_signal);
-    let stop_signal2 = Arc::clone(&stop_signal);
+
    let args2 = args.clone();
+    let mut thread_id_str = "thread-id";
+    if is_server {
+        thread_id_str = "server-thread-id";
+    }
+    let mut command_output_str = "command-output";
+    if is_server {
+        command_output_str = "server-command-output";
+    }
    thread::spawn(move || {
+        let core_path = get_tool_exe_path("\\easytier\\easytier-core.exe");
        // trace, debug, info, warn, error, off
-        let mut child = Command::new("easytier/easytier-core.exe")
+        let mut child = Command::new(&core_path)
            .args(args)
            .creation_flags(0x08000000)
            .stdout(Stdio::piped())
@@ -235,36 +448,36 @@ fn run_command(

        println!("child id: {}", child.id());
        app_handle1
-            .emit("thread-id", child.id())
+            .emit(thread_id_str, child.id())
            .expect("failed to emit id event");
        app_handle1
-            .emit("command-output", args2.join(" "))
+            .emit(command_output_str, args2.join(" "))
            .expect("error output args");
        let stdout = child.stdout.take().expect("failed to capture stdout");
        let reader = BufReader::new(stdout);

        for line in reader.lines() {
            match line {
-                Ok(line) => {
-                    tx.send(line).expect("failed to send line");
-                }
+                Ok(line) => match tx.send(line) {
+                    Ok(_) => {}
+                    Err(e) => {
+                        log::error!("error sending line: {}", e);
+                        break;
+                    }
+                },
                Err(e) => {
-                    eprintln!("error reading line: {}", e);
+                    log::error!("error reading line: {}", e);
                    break;
                }
            }
        }
-        stop_signal1.store(true, Ordering::Relaxed);
        println!("end");
    });

    thread::spawn(move || {
        while let Ok(line) = rx.recv() {
-            if stop_signal2.load(Ordering::Relaxed) {
-                break;
-            }
            app_handle2
-                .emit("command-output", line)
+                .emit(command_output_str, line)
                .expect("failed to emit event");
        }
    });
@@ -310,20 +523,17 @@ async fn fetch_easytier_list() -> Vec<Vec<[String; 3]>> {
            }
            release_list.push(assets_list);
        }
-        return release_list;
+        release_list
    } else {
-        return Vec::new();
+        Vec::new()
    }
 }

 fn toggle_window_visibility<R: tauri::Runtime>(app: &tauri::AppHandle<R>) {
    if let Some(window) = app.get_webview_window("main") {
-        if window.is_visible().unwrap_or_default() {
-            let _ = window.hide();
-        } else {
-            let _ = window.show();
-            let _ = window.set_focus();
-        }
+        let _ = window.show();
+        let _ = window.unminimize();
+        let _ = window.set_focus();
    }
 }

@@ -355,7 +565,7 @@ fn get_exe_directory() -> Vec<String> {
    let mut ret_vec: Vec<String> = Vec::new();
    match std::env::current_exe() {
        Ok(exe_path) => {
-            println!("Path of this executable is: {}", exe_path.display());
+            // println!("Path of this executable is: {}", exe_path.display());
            ret_vec.push(exe_path.display().to_string());
            ret_vec.push(exe_path.parent().unwrap().display().to_string());
            return ret_vec;
@@ -378,7 +588,7 @@ fn spawn_autostart(enabled: bool) {
            let _ = tx.send(true);
        }
        Err(e) => {
-            println!("Error: {}", e);
+            log::error!("Error: {}", e);
            let _ = tx.send(false);
        }
    });
@@ -430,12 +640,14 @@ fn autostart_is_enabled() -> bool {
            return enabled;
        }
        Err(e) => {
-            println!("autostart enabled: false -> {}", e);
+            log::error!("autostart enabled: false -> {}", e);
            return false;
        }
    }
 }

+// pub const AUTOSTART_ARG: &str = "--autostart";
+pub const TASKAUTOSTART_ARG: &str = "--task-auto-start";
 fn autostart(enabled: bool) -> std::result::Result<(), Box<dyn std::error::Error>> {
    if !enabled {
        unsafe {
@@ -486,7 +698,7 @@ fn autostart(enabled: bool) -> std::result::Result<(), Box<dyn std::error::Error
        sb.create_logon()
            .author("heixiansen")?
            .trigger("trigger", enabled)?
-            .action(Action::new("auto start", exe, "", ""))?
+            .action(Action::new("auto start", exe, "", &TASKAUTOSTART_ARG))?
            .in_folder("easytierGame")?
            .principal(settings)?
            .delay(Duration {
@@ -499,38 +711,50 @@ fn autostart(enabled: bool) -> std::result::Result<(), Box<dyn std::error::Error
    Ok(())
 }

-pub const AUTOSTART_ARG: &str = "--autostart";
-
 #[cfg_attr(mobile, tauri::mobile_entry_point)]
 pub fn run() {
-    let stop_signal = Arc::new(AtomicBool::new(false)); // 创建一个原子布尔值，用于控制命令的停止
-    let stop_signal_clone = Arc::clone(&stop_signal); // 创建一个原子布尔值的克隆，用于传递给命令
+    // 获取命令行参数
+    let _args: Vec<String> = std::env::args().collect();
+
    let context = tauri::generate_context!();
    tauri::Builder::default()
+        .plugin(tauri_plugin_dialog::init())
+        .plugin(tauri_plugin_cli::init())
+        .plugin(
+            tauri_plugin_window_state::Builder::new()
+                .with_state_flags(tauri_plugin_window_state::StateFlags::SIZE)
+                .build(),
+        )
        .plugin(tauri_plugin_clipboard_manager::init())
        .plugin(tauri_plugin_fs::init())
-        .plugin(tauri_plugin_autostart::init(
-            MacosLauncher::LaunchAgent,
-            Some(vec![AUTOSTART_ARG]),
-        ))
        .plugin(tauri_plugin_shell::init())
        .plugin(tauri_plugin_single_instance::init(|app, _args, _cwd| {
            let _ = app
                .get_webview_window("main")
                .expect("no main window")
-                .set_focus();
+                .set_focus()
+                .expect("failed to set focus");
        }))
-        .setup(|app| {
-            if cfg!(debug_assertions) {
-                app.handle().plugin(
-                    tauri_plugin_log::Builder::default()
-                        .level(log::LevelFilter::Info)
-                        .build(),
-                )?;
-            }
+        .setup(move |app| {
+            // let args = args.clone();
+            // if cfg!(debug_assertions) {
+            let log_path = get_tool_exe_path("\\easytier\\guiLogs");
+            app.handle().plugin(
+                tauri_plugin_log::Builder::default()
+                    .target(tauri_plugin_log::Target::new(
+                        tauri_plugin_log::TargetKind::Folder {
+                            path: std::path::PathBuf::from(log_path),
+                            file_name: None,
+                        },
+                    ))
+                    .max_file_size(50_000 /* bytes */)
+                    .level(log::LevelFilter::Error)
+                    .build(),
+            )?;
+            // }
            #[cfg(not(target_os = "android"))]
            let _tray_menu = TrayIconBuilder::with_id("main")
-                .menu_on_left_click(false)
+                .show_menu_on_left_click(false)
                .on_tray_icon_event(|tray, event| {
                    if let TrayIconEvent::Click {
                        button: MouseButton::Left,
@@ -547,21 +771,32 @@ pub fn run() {
                ))?)
                .icon_as_template(false)
                .build(app)?;
+
+            // 开机自启隐藏到托盘或者显示主窗口
+            // if !args.contains(&String::from(TASKAUTOSTART_ARG)) {
+            //     let main_window = app.get_webview_window("main").unwrap();
+            //     main_window.show().expect("failed to show window");
+            //     main_window.set_focus().expect("failed to set focus");
+            // }
+
            Ok(())
        })
-        .manage(stop_signal_clone)
        .invoke_handler(tauri::generate_handler![
            run_command,
            stop_command,
            get_core_version,
            fetch_easytier_list,
+            fetch_game_releases,
            download_easytier_zip,
-            get_cli_version,
            get_members_by_cli,
+            get_route_by_cli,
            search_pid_by_pname,
            get_exe_directory,
            spawn_autostart,
-            autostart_is_enabled
+            autostart_is_enabled,
+            prevent_sleep,
+            allow_sleep,
+            get_network_adapter_guids
        ])
        .run(context)
        .expect("error while running tauri application");
@@ -1,7 +1,7 @@
 {
 	"$schema": "../node_modules/@tauri-apps/cli/config.schema.json",
 	"productName": "easytier-game",
-	"version": "1.1.6",
+	"version": "1.3.7",
 	"identifier": "com.tauri.easytier-game",

 	"build": {
@@ -13,7 +13,8 @@
 	"app": {
 		"windows": [
 			{
-				"title": "easytier-game 1.1.6",
+				"title": "easytier-game 1.3.7",
+				"label": "main",
 				"minWidth": 340,
 				"width": 340,
 				"height": 305,
@@ -24,6 +25,7 @@
 				"fullscreen": false,
 				"decorations": true,
 				"center": true,
+				"visible": false,
 				"maximizable": false,
 				"transparent": false
 			}
@@ -32,18 +34,37 @@
 			"csp": null
 		}
 	},
-	"plugins": {},
+	"plugins": {
+		"cli": {
+			"description": "easytier game CLI Plugin",
+			"args": [
+				{
+					"name": "task-auto-start",
+					"description": "easytier game autostart"
+				}
+			]
+		}
+	},
 	"bundle": {
 		"active": false,
 		"targets": "all",
 		"resources": [
 			"easytier/config/",
 			"easytier/icons/",
+			"easytier/config_template.json",
 			"easytier/tool/WinIPBroadcast.exe",
+			"easytier/tool/ForceBindIP.exe",
+			"easytier/tool/ForceBindIP64.exe",
+			"easytier/tool/BindIP.dll",
+			"easytier/tool/BindIP64.dll",
+			"easytier/tool/MicrosoftEdgeWebview2Setup.exe",
 			"easytier/easytier-cli.exe",
 			"easytier/easytier-core.exe",
 			"easytier/Packet.dll",
-			"easytier/wintun.dll"
+			"easytier/wintun.dll",
+			"easytier/clear_local_data.bat",
+			"帮助.txt",
+			"uninstall.exe"
 		],
 		"windows": {
 			"webviewInstallMode": {
@@ -0,0 +1,24 @@
+[如果界面无法打开]
+
+1. 如果您已经启动easytier-game.exe，那它可能会在后台运行，打开任务管理器关闭easytier-game.exe
+
+2. 使用easytier-game安装目录下的 easytier/tool/MicrosoftEdgeWebview2Setup.exe 安装webview2
+
+3. 再次启用easytier-game.exe
+
+
+[如果想彻底删除easytierGame]
+
+1. 关闭easytierGame
+
+2. 运行easytier-game安装目录下的 easytier/clear_local_data.bat (需要管理员权限) 输入y确认，清除本地存储数据
+
+3. 删除easytierGame文件夹
+
+
+[没有服务器，怎么自建服务]
+1. 点击 启动联机 按钮旁边的箭头 选择自建服务 设置好端口号后 点击启动服务器
+
+2. 搜索一下 openFrp mossFrp sakurafrp 等 将你的本地服务通过它（们）代理到公网
+
+3. 将代理之后的地址发给别人，他们就可以通过这个加入你的服务了
@@ -1,9 +1,9 @@
-import { defineStore } from "pinia";
-export default defineStore("main", {
+import { acceptHMRUpdate, defineStore } from "pinia";
+const store = defineStore("main", {
 	state() {
 		return {
 			config: {
-				protocol: ["tcp", "udp"], // 网络协议
+				protocol: ["tcp"], // 网络协议
 				serverUrl: "public.easytier.top:11010",
 				networkName: "",
 				networkPassword: "",
@@ -11,8 +11,13 @@ export default defineStore("main", {
 				ipv4: "",
 				proxyNetworks: "", // 子网代理
 				autoStart: false, // 是否自动启动
-				coonectAfterStart: false, //软件打开后，是否自动连接
+				connectAfterStart: false, //软件打开后，是否自动连接
 				disableIpv6: false, // 是否禁用IPv6
+				port: "11010", // 监听端口号
+				enableCustomListener: true, // 是否自定义监听
+				customListenerV6Data: "udp://[::]:11010", //自定义ipv6监听
+				enableCustomListenerV6: true, // 是否自定义监听
+				customListenerData: "tcp://0.0.0.0:11010\nudp://0.0.0.0:11010\ntcp://[::]:11010", // 自定义监听地址
 				disbleListenner: false, // 是否禁用监听
 				disableEncryption: false, // 是否禁用加密
 				multiThread: false, //使用多线程
@@ -21,42 +26,60 @@ export default defineStore("main", {
 				latencyfirst: false, // 是否优先延迟
 				useSmoltcp: false, // 是否为子网代理启用smoltcp堆栈
 				disableUdpHolePunching: false, // 是否禁用UDP打洞
-				relayAllPeerrpc: false, // 是否启用所有对等RPC
+				relayAllPeerrpc: true, // 是否启用所有对等RPC
 				disbleP2p: false, // 是否使用P2P
 				dhcp: true, // 是否使用DHCP
 				saveErrorLog: true, // 是否保存错误日志
 				logLevel: "error", //日志等级
-				devName: false, //自定义网卡名
-				devNameValue: "", //自定义网卡名
+				devName: true, //自定义网卡名
+				devNameValue: "etgame", //自定义网卡名
+				enableCustomProtocol: true, //自定义默认协议
+				customProtocol: "tcp", //自定义默认协议
+				enableNetCardMetric: true, //启用网卡自定义跃点
+				netCardMetricValue: 1, //自定义网卡跃点值
+				enablePreventSleep: false, //组织系统休眠
+				compression: "none", //加密算法
 			},
+			serverConfig: {
+				enableWhiteList: true, // 是否启用白名单
+				relayAllPeerrpc: false, // 是否启用所有对等RPC
+				serverWhiteList: "", // 服务器流量转发白名单
+				// enableListener: true, // 是否启用监听
+				autoStart: false, //随软件自启
+				port: "11010" // 服务器端口
+			},
+			cidrEnable: false,
+			basePeers: ["public.easytier.top:11010","public.easytier.net:11010"],
 			theme: false, //主题  false light true dark
 			configStartEnable: false, //使用配置文件启动
 			configPath: "", //配置文件路径
-			cidrEnable: false,
-			winipBcPid: 0,
-			winipBcStart: false,
 			winIpBcAutoStart: true,
-			basePeers: ["public.easytier.top:11010"],
+			createConfigInEasytier: false, //在easytier目录生成config.json文件吗
+			githubFastUrl: "https://ghproxy.cc/",
+
+			// forceBindIp配置
+			forceBindIpBit: "64",
+			delayInjectDll: false,
+			forceBindInput: "",
+			forceBindFile: "",
+
+			winipBcPid: 0,
+			winipBcStart: false
 		};
 	},
 	persist: {
-		paths: [
-			"basePeers",
-			"cidrEnable",
-			"theme",
-			"configStartEnable",
-			"configPath",
-			"winIpBcAutoStart",
-			"config.proxyNetworks",
+		// 防止持久化保存 用户使用config.json输入的无用的字段
+		pick: [
+			"config.protocol",
 			"config.serverUrl",
 			"config.networkName",
-			"config.protocol",
 			"config.networkPassword",
-			"config.disbleP2p",
+			"config.hostname",
+			"config.ipv4",
+			"config.proxyNetworks",
 			"config.autoStart",
-			"config.coonectAfterStart",
+			"config.connectAfterStart",
 			"config.disableIpv6",
-			"config.disbleListenner",
 			"config.disableEncryption",
 			"config.multiThread",
 			"config.enablExitNode",
@@ -65,13 +88,51 @@ export default defineStore("main", {
 			"config.useSmoltcp",
 			"config.disableUdpHolePunching",
 			"config.relayAllPeerrpc",
-			"config.hostname",
-			"config.ipv4",
+			"config.disbleP2p",
 			"config.dhcp",
 			"config.saveErrorLog",
 			"config.logLevel",
 			"config.devName",
 			"config.devNameValue",
-		],
-	},
+			"config.enableNetCardMetric",
+			"config.netCardMetricValue",
+			"config.port",
+			
+			"config.disbleListenner",
+			"config.enableCustomListener",
+			"config.customListenerData",
+			"config.enableCustomListenerV6",
+			"config.customListenerV6Data",
+
+			"config.enableCustomProtocol",
+			"config.customProtocol",
+			"config.enablePreventSleep",
+			"config.compression",
+
+			"serverConfig.autoStart",
+			// 'serverConfig.enableListener',
+			"serverConfig.enableWhiteList",
+			"serverConfig.relayAllPeerrpc",
+			"serverConfig.serverWhiteList",
+			"serverConfig.port",
+
+			"cidrEnable",
+			"basePeers",
+			"theme",
+			"configStartEnable",
+			"configPath",
+			"winIpBcAutoStart",
+			"createConfigInEasytier",
+			"githubFastUrl",
+
+			"forceBindIpBit",
+			"delayInjectDll",
+			"forceBindInput",
+			"forceBindFile"
+		]
+		// // 除了这些，其他都要存下来
+		// omit: ["winipBcPid", "winipBcStart"]
+	}
 });
+if (import.meta.hot) import.meta.hot.accept(acceptHMRUpdate(store, import.meta.hot));
+export default store;
@@ -1,8 +1,8 @@
 /** @type {import('tailwindcss').Config} */
 /** @type {import('tailwindcss/plugin')} */
-
-const plugin = require("tailwindcss/plugin");
-module.exports = {
+import plugin from "tailwindcss/plugin"
+// const plugin = require("tailwindcss/plugin");
+export default {
 	content: ["./components/**/*.{js,vue,ts}", "./layouts/**/*.vue", "./pages/**/*.vue", "./plugins/**/*.{js,ts}", "./app.vue", "./error.vue"],
 	theme: {
 		extend: {}
@@ -6,6 +6,7 @@
 		"components/**/*.ts",
 		"components/**/*.js",
 		"components/**/*.vue",
+		"composables/**/*.ts",
 		"app.vue",
 		"pages/**/*.ts",
 		"pages/**/*.js",
@@ -28,16 +29,16 @@
 	"compilerOptions": {
 		"target": "ESNext",
 		"module": "ESNext",
+		"moduleResolution": "Node",
 		// 	"types": ["element-plus/global"]
 		"resolveJsonModule": true,
 		// 从 Vue 3.4 开始，Vue 不再隐式注册全局 JSX 命名空间。要指示 TypeScript 使用 Vue 的 JSX 类型定义，请确保在你的 tsconfig.json 中包含以下内容
 		"jsx": "preserve",
 		"jsxImportSource": "vue",
-		"types": ["@pinia/nuxt", "vite/client", "element-plus/global"],
+		"types": ["@pinia/nuxt", "vite/client", "element-plus/global", "pinia-plugin-persistedstate"],
 		"allowJs": true, // 允许编译器编译JS，JSX文件
-		"checkJs": true, // 允许在JS文件中报错，通常与allowJS一起使用
+		"checkJs": false, // 允许在JS文件中报错，通常与allowJS一起使用
 		"esModuleInterop": true, // 允许export=导出，由import from 导入
-
 		"lib": ["DOM", "ESNext"],
 		"allowSyntheticDefaultImports": true
 	}
@@ -1,5 +1,9 @@
 interface ImportMetaEnv {
 	readonly VITE_CONFIG_PATH: string;
+	readonly VITE_CONFIG_FILE_NAME: string;
+	readonly VITE_LOG_PATH: string;
+	readonly VITE_CACHE_PATH: string;
+	readonly VITE_AUTO_START_SERVICE_NAME: string;
 }

 interface ImportMeta {
@@ -1,7 +1,7 @@
 import { ElMessageBox } from "element-plus";
 import { ATJ } from "./index";
 import { h, type VNode } from "vue";
-type Opt = { action?: string; confirmButtonText?: string; cancelButtonText?: string; VNode?: VNode | null }
+type Opt = { action?: string; confirmButtonText?: string; cancelButtonText?: string; VNode?: VNode | null, showCancelButton?:boolean }
 export const ElConfirmDanger = (
 	content: string,
 	title: string,
@@ -29,6 +29,8 @@ export const ElConfirmDanger = (
 	}
 	return ATJ(
 		ElMessageBox.confirm(message, title, {
+			closeOnClickModal: false, // 点击遮罩层不关闭弹窗
+			closeOnPressEscape: false, // 按下Esc键不关闭弹窗
 			cancelButtonText,
 			confirmButtonText,
 			confirmButtonClass: "el-button--danger"
@@ -63,6 +65,8 @@ export const ElConfirmSucces = (
 	}
 	return ATJ(
 		ElMessageBox.confirm(message, title, {
+			closeOnClickModal: false, // 点击遮罩层不关闭弹窗
+			closeOnPressEscape: false, // 按下Esc键不关闭弹窗
 			cancelButtonText,
 			confirmButtonText,
 			confirmButtonClass: "el-button--success"
@@ -77,10 +81,11 @@ export const ElConfirmPrimary = (
 		action: "",
 		confirmButtonText: "确定",
 		cancelButtonText: "取消",
+		showCancelButton: true,
 		VNode: null
 	}
 ): Promise<any | [any, any]> => {
-	const { action = "", confirmButtonText = "确定", cancelButtonText = "取消", VNode = null } = opt;
+	const { action = "", confirmButtonText = "确定", cancelButtonText = "取消", VNode = null, showCancelButton = true } = opt;
 	const formatContentArr = content.split("{action}");
 	const action_length = formatContentArr.length - 1;
 	const messageArr = [];
@@ -97,6 +102,9 @@ export const ElConfirmPrimary = (
 	}
 	return ATJ(
 		ElMessageBox.confirm(message, title, {
+			closeOnClickModal: false, // 点击遮罩层不关闭弹窗
+			closeOnPressEscape: false, // 按下Esc键不关闭弹窗
+			showCancelButton,
 			cancelButtonText,
 			confirmButtonText,
 			confirmButtonClass: "el-button--primary"
@@ -1,19 +1,7 @@
-
-import { ElMessage } from "element-plus";
-import Clipboard from "vue-clipboard3";
-
+import { invoke } from "@tauri-apps/api/core";
+import { open } from "@tauri-apps/plugin-shell";
 export const ENV = import.meta.env;

-export const clipBoardCopy = async (text: string) => {
-	const { toClipboard } = Clipboard();
-	try {
-		await toClipboard(text);
-		ElMessage.success("复制成功");
-	} catch (e) {
-		ElMessage.error("复制失败");
-	}
-};
-
 //防抖
 export const bounce = (time = 3000) => {
 	let bounceTimer: NodeJS.Timeout | null = null;
@@ -63,8 +51,8 @@ export const numRemoveZero = (num: Number) => {
 // await-to-js
 export const ATJ = (promise: Promise<any>, errorExt: string | undefined = undefined) => {
 	return promise
-		.then(data => [null, data])
-		.catch(err => {
+		.then((data) => [null, data])
+		.catch((err) => {
 			if (errorExt) {
 				if (typeof errorExt !== "object") {
 					return [errorExt, undefined];
@@ -77,38 +65,72 @@ export const ATJ = (promise: Promise<any>, errorExt: string | undefined = undefi
 		});
 };

-export const parsePeerInfo = (content: string) => {
+const _supportProtocols = ["tcp", "udp", "ws", "wss", "quic"];
+
+export const supportProtocols = () => {
+	return _supportProtocols.slice();
+}
+
+let _prevent_timer: NodeJS.Timeout| null = null;
+let _prevent_timer_count = 15; // 秒
+export const preventSleep = () => {
+	_prevent_timer && clearInterval(_prevent_timer);
+	_prevent_timer = setInterval(async () => {
+	    const result = await invoke('prevent_sleep');
+		// console.log(`trigger prevent sleep ${result}`);
+	}, _prevent_timer_count * 1000);
+}
+
+export const stopPreventSleep = async () => {
+	_prevent_timer && clearInterval(_prevent_timer);
+	_prevent_timer = null;
+	const _result = await invoke('allow_sleep');
+}
+
+export const parseCliInfo = (content: string) => {
+	if(!content) return [];
 	// 将表格字符串分割成行
-	const lines = content.split('\n')
-  
+	const lines = content.split("\n");
+
 	// 提取表头（keys）
 	const headers = lines[1]
-	  .split('│')
-	  .slice(1, -1)
-	  .map((h) => h.trim())
-  
+		.split("│")
+		.slice(1, -1)
+		.map((h) => h.trim());
+
 	// 初始化结果数组
-	const result: any[] = []
-  
+	const result: any[] = [];
+
 	// 遍历数据行
 	for (let i = 3; i < lines.length - 1; i += 2) {
-	  if (lines[i].trim() === '') continue // 跳过空行
-  
-	  // 分割每一行的数据
-	  const values = lines[i]
-		.split('│')
-		.slice(1, -1)
-		.map((v) => v.trim())
-  
-	  // 创建对象并添加到结果数组
-	  const obj: any = {}
-	  headers.forEach((header, index) => {
-		obj[header] = values[index] === '-' || values[index] === '' ? null : values[index]
-	  })
-  
-	  // 每行数据都作为一个新对象添加到结果数组中
-	  result.push(obj)
+		if (lines[i].trim() === "") continue; // 跳过空行
+
+		// 分割每一行的数据
+		const values = lines[i]
+			.split("│")
+			.slice(1, -1)
+			.map((v) => v.trim());
+
+		// 创建对象并添加到结果数组
+		const obj: any = {};
+		headers.forEach((header, index) => {
+			obj[header] = values[index] === "-" || values[index] === "" ? null : values[index];
+		});
+
+		// 每行数据都作为一个新对象添加到结果数组中
+		result.push(obj);
 	}
-  
-	return result
-  }
+
+	return result;
+};
+
+export const addQQGroup = () => {
+	open("https://qm.qq.com/q/Yo3HmaEIWC");
+};
+
+export function isValidIP(ip: string) {
+	const ipv4Pattern =
+		/^(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)$/;
+	const ipv6Pattern = /^(?:[A-Fa-f0-9]{1,4}:){7}[A-Fa-f0-9]{1,4}$/;
+	return ipv4Pattern.test(ip) || ipv6Pattern.test(ip);
+}
@@ -1,5 +1,4 @@
 import useMainStore from "@/stores/index";
-import * as tauriAutoStart from "@tauri-apps/plugin-autostart";
 import { open, Command } from "@tauri-apps/plugin-shell";
 import { invoke } from "@tauri-apps/api/core";

@@ -52,19 +51,3 @@ const handleAutoStartByNssm = async () => {
 		}
 	}
 };
-
-// 兼容autostart插件
-const compatibleAutoStart = async () => {
-    const config = useMainStore().config;
-	const is_enable = await tauriAutoStart.isEnabled();
-	if (is_enable) {
-		try {
-			await tauriAutoStart.disable();
-			config.autoStart = false;
-		} catch (err) {
-			// ElMessage.error(`取消自启失败`);
-		}
-	}
-	const serverStatus = await Command.create("nssm", ["status", import.meta.env.VITE_AUTO_START_SERVICE_NAME]).execute();
-	console.log(serverStatus);
-};
@@ -0,0 +1,68 @@
+/**
+ * 生成 release 发布包 zip 文件
+ */
+const pkg = require("./package.json");
+const isWin7 = process.argv[2] == 'win7';
+const releaseDir = isWin7 ? "./src-tauri/target/x86_64-win7-windows-msvc/release" : "./src-tauri/target/release";
+const fileName = isWin7 ?  `easytier-game_windows7_fix_${pkg.version}.zip` : `easytier-game_windows_x86_64_${pkg.version}.zip`; // 发布包格式
+const releaseDirEasytier = `${releaseDir}/easytier/`;
+const releaseExe = `${releaseDir}/easytier-game.exe`;
+const releaseHelp = `${releaseDir}/帮助.txt`;
+const releaseUninstall = `${releaseDir}/uninstall.exe`;
+const deleteEasytierFiles = ["logs/", "guiLogs/", "cache/"];
+const releaseZipDir = "./release";
+const releaseZip = `${releaseZipDir}/${fileName}`;
+
+const fs = require("fs");
+const path = require("path");
+const archiver = require("archiver");
+
+const output = fs.createWriteStream(path.join(__dirname, releaseZip));
+const archive = archiver("zip", {
+	zlib: { level: 8 } // Sets the compression level.
+});
+
+// listen for all archive data to be written
+// 'close' event is fired only when a file descriptor is involved
+output.on("close", function () {
+	console.log(archive.pointer() + " total bytes");
+	console.log(`archiver has been finalized and the output ${releaseZip}`);
+});
+
+// This event is fired when the data source is drained no matter what was the data source.
+// It is not part of this library but rather from the NodeJS Stream API.
+// @see: https://nodejs.org/api/stream.html#stream_event_end
+output.on("end", function () {
+	console.log("Data has been drained");
+});
+
+// good practice to catch warnings (ie stat failures and other non-blocking errors)
+archive.on("warning", function (err) {
+	if (err.code === "ENOENT") {
+		// log warning
+	} else {
+		// throw error
+		throw err;
+	}
+});
+
+archive.on("error", function (err) {
+	throw err;
+});
+
+for (const f of deleteEasytierFiles) {
+	fs.rmSync(path.join(__dirname, releaseDirEasytier + f), { recursive: true, force: true });
+}
+const r = path.join(__dirname, releaseZipDir);
+if (!fs.existsSync(r)) {
+	fs.mkdirSync(r);
+}
+
+// pipe archive data to the file
+archive.pipe(output);
+archive
+	.append(fs.createReadStream(path.join(__dirname, releaseExe)), { name: "easytier-game.exe" })
+	.append(fs.createReadStream(path.join(__dirname, releaseHelp)), { name: "帮助.txt" })
+	.append(fs.createReadStream(path.join(__dirname, releaseUninstall)), { name: "uninstall.exe" })
+	.directory(path.join(__dirname, releaseDirEasytier), "easytier")
+	.finalize();
Author	SHA1	Message	Date
黑先森	41f58f1df6	重大结构更新 + 升级rust为1.8版本 + 升级tauri为最新版，以及其他包升级 + 现在构建分为window7和window7以上两种版本 + 优化分享配置弹窗遮盖问题 + 增加uninstall.exe（不会删除日志） + 增加windows.0.48.5.lib + 增加build.bat 内含windows7构建之前的操作	2025-01-16 16:53:51 +08:00
黑先森	0a17c269ea	这是一个测试分支，用于rust最新包更新与适配	2025-01-10 18:42:02 +08:00
黑先森	6fd3b999d7	修复安全漏洞	2025-01-09 10:33:42 +08:00
黑先森	3773e11b24	去除房间信息tooltip	2025-01-09 09:53:35 +08:00
黑先森	987541ab52	Merge branch 'dev_1.3.6_package_upgrade'	2025-01-08 15:04:57 +08:00
黑先森	d800a414c0	升级package,增强工具防火墙类别，新增自定义防火墙策略界面开启按钮	2025-01-08 12:12:00 +08:00
黑先森	922ba3f1ea	优化主界面文字说明，高级选项排版和文字说明	2025-01-06 20:00:47 +08:00
黑先森	a5954744a1	更新readme	2025-01-03 17:28:15 +08:00
黑先森	8ed652ee26	托盘菜单新增公共节点	2025-01-03 17:16:06 +08:00
黑先森	9d976707ac	增强工具内新增forceBindIP方案	2025-01-03 16:55:47 +08:00
黑先森	0b54a623a8	版本号 -> 1.3.5 + 优化字段信息	2025-01-03 11:42:52 +08:00
黑先森	7501a5661c	修复不启用config.json，但是本地存在config.json，无法取消勾选的bug，增加删除config.json的提示	2025-01-03 10:39:54 +08:00
黑先森	539092d769	升级nuxt -> 3.15.0 修复防止休眠无法停止的问题	2024-12-31 11:46:04 +08:00
黑先森	cefcc930b8	打包最新版easytier内核 2.1.1	2024-12-25 15:32:42 +08:00
黑先森	e7d92cce47	更新包版本，优化分享配置操作，增加不进行分享的配置提示 Cargo.toml + tauri-plugin-single-instance 2.2.0 + tauri-plugin-cli 2.2.0 + tauri-plugin-window-state 2.2.0 + tauri-plugin-fs 2.2.0 + tauri-plugin-log 2.2.0 + tauri-plugin-shell 2.2.0 package.json + "@tauri-apps/plugin-cli" -> ^2.2.0	2024-12-25 15:26:27 +08:00
黑先森	76bdec0e1d	修复自定义协议勾选后没持久化存储的bug	2024-12-21 17:53:55 +08:00
黑先森	997f3798ae	优化文字提示，修复压缩算法选择不生效问题	2024-12-20 22:29:04 +08:00
黑先森	f9e0b8e1db	新增 + 优化 + 高级选项增加2.1.0内核功能压缩算法和ipv6监听地址 + 增加服务器地址栏复制按钮 + 更新内核为最新版本 + config.json 新增压缩算法配置可参考 config_template.json	2024-12-20 16:10:57 +08:00
黑先森	582a4ab819	增加子网代理使用的判断	2024-12-19 17:23:28 +08:00
黑先森	0fde619516	优化对githubApi的请求，减少被过滤无法获取的情况发生	2024-12-19 17:11:03 +08:00
黑先森	410f0dc32b	新增+修复+优化 + 新增子网代理页面表格查看代理情况 + 修复子网代理启动联机被覆盖的bug + 优化部分代码逻辑	2024-12-19 16:41:09 +08:00
leizi97	e977c633d6	1.3.1发布	2024-12-17 22:44:02 +08:00
黑先森	3cbfae072c	增加easytierGame发布新版的提示	2024-12-17 17:48:11 +08:00
黑先森	9b856f31af	优化与修复 + 点击托盘只显示窗口，优化显示窗口逻辑，修复无法显示到最上层的问题 + 防止休眠代码优化，修复防止休眠选中后没保存的问题	2024-12-17 15:50:27 +08:00
黑先森	7d6e93d796	增加防止系统休眠功能修复winipboadcast关闭后再次打开又启动的bug，优化成员列表字体大小和布局	2024-12-04 18:13:55 +08:00
黑先森	0253d95597	Merge branch 'dev_1.2.9'	2024-12-03 19:00:26 +08:00
黑先森	a2be6ebe86	全局状态同步，修复winipbroadcast无法停止的bug	2024-12-03 18:39:37 +08:00
黑先森	b94d5de463	优化多个界面的数据同步问题，增加功能，修复bug 高级选项-增加默认协议配置高级选项-增加自定义监听相关配置修复创建子窗口多次触发监听的问题 config.json增加对自定义协议配置优化高级选项文本说明	2024-12-03 18:07:42 +08:00
黑先森	e8b82007c2	不再兼容原autostart库-移除autostart库将开机自启检测使用plugins-cli进行判断修复创建窗口后多次触发监听的情况	2024-12-03 16:08:59 +08:00
黑先森	5d11f39855	修复使用配置文件启动无法获取IP的问题	2024-12-02 17:24:33 +08:00
黑先森	5875b30c34	增加 prettier 包	2024-12-02 14:49:46 +08:00
黑先森	3aa90dbb67	once改为listen修复日志监听无法触发的bug 增加输入框右键菜单增加成员列表接收和传输的字符大小优化成员列表nat_type为中文修复ipv4无法显示的问题	2024-11-30 15:16:40 +08:00
黑先森	02b53098e8	内核管理增加打开内核缓存目录按钮	2024-11-28 11:43:05 +08:00
黑先森	c9fcc40ee3	修复弹窗点击空白区域关闭的问题	2024-11-28 11:00:41 +08:00
黑先森	5e418bd6e5	修复断开连接后成员列表界面卡死的情况	2024-11-28 10:59:10 +08:00
黑先森	779f5cecf1	更新 readme	2024-11-27 20:01:57 +08:00
黑先森	8373efa3ba	增加内核管理判断	2024-11-27 19:54:43 +08:00
黑先森	73ae6b90db	内核管理下载的内核保存于easytier/cache目录，下次切换不用下载	2024-11-27 19:47:38 +08:00
黑先森	55c6e49d4a	自建服务器单独重写，成员列表新增断开连接判断，联机增加断开联机的检测	2024-11-27 19:24:19 +08:00
黑先森	5fc931f94e	自建服务器功能重写: 基础配置	2024-11-26 18:17:19 +08:00
黑先森	8120b65c9b	增加处于联机状态切换自建服务器时的确认 + 升级vue -> 3.5.13 + 升级nuxt -> 3.14.1592	2024-11-26 17:46:31 +08:00
黑先森	7af0683775	帮助文档外移至easytier-game.exe同级	2024-11-25 16:08:54 +08:00
黑先森	4191a0a12d	增加生成release包的方法	2024-11-25 15:53:42 +08:00
黑先森	66d8bff8b4	修复打印日志config，修复配置文件启动权重不是最高权重的bug	2024-11-25 15:23:21 +08:00
黑先森	c740039325	更新readme	2024-11-25 14:42:52 +08:00
黑先森	589511e356	新增自建服务器功能，修复优化部分文本，成员列表新增通道协议显示	2024-11-25 14:30:18 +08:00
黑先森	c2d060b202	更新readme 直接使用群号	2024-11-22 18:03:44 +08:00
黑先森	d2cd72fed9	增加部分头像和群图，更新readme	2024-11-22 11:55:39 +08:00
leizi97	efee636180	增加tooltip文本提示	2024-11-21 23:43:51 +08:00
leizi97	4e3f1cbd89	系统托盘增加联机和断开的切换	2024-11-21 23:37:24 +08:00
黑先森	c23191fe45	修复开机自启搭配配置文件方式启动出现的找不到文件路径问题，并增加配置文件启动相关判断	2024-11-21 18:17:34 +08:00
leizi97	0776b074d2	文档更新	2024-11-20 22:45:07 +08:00
leizi97	cdd3fada1f	新增内核管理模块，可切换easytier内核版本，优化帮助和清除数据提示	2024-11-20 22:36:33 +08:00
黑先森	fe785f6066	增加easytierGame帮助文档，包括删除和打不开界面解决方案	2024-11-20 20:26:23 +08:00
黑先森	37fd7b6fb0	修复一些文本说明，增加清除easytierGame数据的bat，可用于完全卸载easytierGame	2024-11-20 12:09:07 +08:00
leizi97	096d5f03da	增加nat类型显示	2024-11-17 22:09:32 +08:00
leizi97	1813240378	增加gui日志，修复config.json无效的问题，修复下载内核失败一直加载的问题	2024-11-17 21:52:49 +08:00
黑先森	2d4a44740a	增加窗口保存需要的权限，修改启动自动联机错误的英文拼写	2024-11-15 17:25:14 +08:00
黑先森	f0633761a0	保存窗口的大小状态，优化成员列表显示，开机自启隐藏于托盘，服务器地址输入支持带协议 [protocol]://	2024-11-15 16:22:21 +08:00
leizi97	4bedec63ca	开机自启功能修复完成	2024-11-15 00:13:49 +08:00
黑先森	ab67ba94a3	config.json存储优化,新增设置网卡跃点功能,以及其他bug修复 - 修复服务器地址过长导致无法删除地址的问题 - 新增设置网卡跃点功能 - 优化config.json serverUrl的输入格式，可数组或字符串逗号分隔	2024-11-14 14:57:42 +08:00
黑先森	8e6f8d602e	readme修改	2024-11-13 16:50:53 +08:00
黑先森	92d25ab907	新增生成config.json界面基础配置的高级选项	2024-11-13 16:42:55 +08:00
黑先森	1c8314c6fa	更新pinia插件的使用	2024-11-12 20:23:45 +08:00
黑先森	b352d49e0b	manage package 开发环境和生成环境正常运行 remove defu dayjs xlsx @pinia-plugin-persistedstate/nuxt vue qs @types/qs add pinia-plugin-persistedstate update nuxt pinia element-plus(/nuxt) @vitejs/plugin-vue-jsx 修改nuxt.config.ts配置	2024-11-12 18:26:32 +08:00
黑先森	44183b1ad2	升级tauri为2.1.1	2024-11-12 15:40:48 +08:00
黑先森	fe1bc6f89e	增加ping的延迟1秒一次	2024-11-12 14:18:55 +08:00
黑先森	be59e56bd1	fix: 修复分享配置有中文无法分享的问题	2024-11-12 12:12:35 +08:00
@@ -1 +1 @@
 .18.2
 .18.1