更新element-plus和nuxt3包体，删除增强工具-自定义防火墙策略按钮，修复一键关闭防火墙无效的bug

+ tauri升级为最新版
+ 包体统一升级更新

.gitignore

@@ -11,4 +11,6 @@ dist
 .vscode
 release
 
-src-tauri/easytier/logs
+src-tauri/easytier/logs
+src-tauri/easytier/tool/ResourcesExtract.exe
+src-tauri/easytier/tool/ResourcesExtract.cfg

.nvmdrc

@@ -1 +1 @@
-18.18.2
+20.18.3

.prettierrc

@@ -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
+}

README.md

@@ -56,6 +56,9 @@ Releases： [https://github.com/EasyTier/EasytierGame/releases](https://github.c
 - 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组网工具开发，界面清晰简单

app.vue

@@ -9,26 +9,26 @@
 	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) => {
+		console[fnName] = message => {
 			original(message);
-			if (import.meta.env.PROD) {
+			try {
-				try {
+				if (typeof message === "string") {
-					if (typeof message === "string") {
+					logger(message);
-						logger(message);
+				} else {
-					} else {
+					logger(JSON.stringify(message));
-						logger(JSON.stringify(message));
-					}
-				} catch (e) {
-					logger(`${message}`);
 				}
+			} catch (e) {
+				logger(`${message}`);
 			}
 		};
 	}
-	forwardConsole("log", info);
+	if (import.meta.env.PROD) {
-	forwardConsole("debug", debug);
+		forwardConsole("log", info);
-	forwardConsole("info", info);
+		forwardConsole("debug", debug);
-	forwardConsole("warn", warn);
+		forwardConsole("info", info);
-	forwardConsole("error", error);
+		forwardConsole("warn", warn);
+		forwardConsole("error", error);
+	}
 
 	const mainStore = useMainStore();
 	// console.log(mainStore.theme)

assets/css/main.css

@@ -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%;
@@ -46,4 +48,27 @@ html.dark body {
 	align-items: flex-start;
 	overflow: auto;
 	flex: 1;
-}
+}
+
+.el-table {
+	font-size: 12px !important;
+}
+
+.el-select-dropdown__wrap {
+	max-height: 138px !important;
+}
+
+.el-popper:not(.is-pure) {
+	font-size: 10px !important;
+	line-height: 1.2em !important;
+	padding: 5px !important;
+	font-weight: lighter !important;
+}
+
+.el-message-box__content + .el-message-box__btns {
+	display: flex;
+	flex-wrap: wrap;
+	justify-content: flex-start;
+	flex-direction: row-reverse;
+	gap: 0 10px;
+}

build.bat

@@ -0,0 +1,12 @@
+pnpm run build
+@REM rustup default nightly
+@REM rem 使用rust nightly构建支持win7的版本，请先将根目录的windows.0.48.5 放入以下目录
+@REM rem C:\Program Files\Microsoft Visual Studio\2022\Community\VC\Tools\MSVC\你自己的版本\lib\x64
+@REM rem C:\Program Files\Microsoft Visual Studio\2022\Community\VC\Tools\MSVC\你自己的版本\lib\x86
+@REM rem C:\Program Files\Microsoft Visual Studio\2022\Community\VC\Tools\MSVC\你自己的版本\atlmfc\lib\x64
+@REM rem C:\Program Files\Microsoft Visual Studio\2022\Community\VC\Tools\MSVC\你自己的版本\atlmfc\lib\x86
+@REM pnpm tauri build -- -Z  build-std --target x86_64-win7-windows-msvc
+rustup default stable
+pnpm tauri build
+pnpm run release
+@REM pnpm run release-win7

components/CoreVersionWarning.vue

@@ -0,0 +1,3 @@
+<template>
+    <ElTag size="small" type="danger">内核 >= {{ $attrs.version }}</ElTag>
+</template>

composables/configJson.ts

@@ -14,17 +14,16 @@ export const updateConfigJson = async (configJsonSeverUrl: Array<string> | strin
 		const {
 			proxyNetworks,
 			autoStart,
-			relayAllPeerrpc,
 			connectAfterStart,
-			multiThread,
-			enablExitNode,
-			useSmoltcp,
 			saveErrorLog,
-			logLevel,
 			serverUrl,
+			enableCustomListener,
+			customListenerData,
+			bindDeviceEnable,
 			...otherConfig
 		} = mainStore.config;
 		let writeServerUrl: Array<string> | string = serverUrl;
+		let writeCustomListenerData: Array<string> = (customListenerData || "").split("\n");
 		if (isArray) {
 			writeServerUrl = intersection(
 				uniq([serverUrl, ...configJsonSeverUrl]).filter(boolean => boolean),
@@ -37,7 +36,11 @@ export const updateConfigJson = async (configJsonSeverUrl: Array<string> | strin
 				mainStore.basePeers
 			).join(",");
 		}
-		await writeTextFile(path, JSON.stringify({ serverUrl: writeServerUrl, ...otherConfig }, null, 4), { baseDir: BaseDirectory.Resource });
+		await writeTextFile(
+			path,
+			JSON.stringify({ serverUrl: writeServerUrl, enableCustomListener, customListenerData: writeCustomListenerData, ...otherConfig }, null, 4),
+			{ baseDir: BaseDirectory.Resource }
+		);
 	} catch (err) {
 		console.error(err);
 		ElMessage.error(`更新config.json失败`);

composables/icon.ts

@@ -0,0 +1,33 @@
+import { basename, extname } from "@tauri-apps/api/path";
+import { exists } from "@tauri-apps/plugin-fs";
+import { Command } from "@tauri-apps/plugin-shell";
+
+export const getIcon = async function (sourcePath: string, icoDirPath: string) {
+	if(sourcePath.endsWith(".url")) return false;
+	let res = await Command.create("ResourcesExtract", [
+		"/Source",
+		sourcePath,
+		"/DestFolder",
+		icoDirPath,
+		"/ExtractIcons",
+		"1",
+		"/ExtractCursors",
+		"0",
+		"/OpenDestFolder",
+		"0",
+		"/MultiFilesMode",
+		"1"
+	]).execute();
+	if (res.code == 0) {
+		let icoPath = icoDirPath + "\\" + (await basename(sourcePath));
+		icoPath = icoPath.replace(`.${await extname(sourcePath)}`, "_1.ico");
+		if (await exists(icoPath)) {
+			return icoPath;
+		} else {
+			return false;
+		}
+		return;
+	} else {
+		return false;
+	}
+};

composables/netcard.ts

@@ -6,51 +6,55 @@ import { BaseDirectory } from "@tauri-apps/api/path";
 import { exists } from "@tauri-apps/plugin-fs";
 
 const getWinIpBroadcastPid = async () => {
-    const mainStore = useMainStore();
+	const mainStore = useMainStore();
-    const pid = await invoke("search_pid_by_pname", { target_process_name: "WinIPBroadcast" });
+	const pid = await invoke("search_pid_by_pname", { target_process_name: "WinIPBroadcast" });
-    mainStore.winipBcPid = (pid as number) || 0;
+	mainStore.winipBcPid = (pid as number) || 0;
-    if (mainStore.winipBcPid && mainStore.winipBcPid > 0) {
+	mainStore.$patch({
-        mainStore.winipBcStart = true;
+		winipBcStart: !!(mainStore.winipBcPid && mainStore.winipBcPid > 0)
-    } else {
+	});
-        mainStore.winipBcStart = false;
-    }
 };
 
 export const handleWinipBcStart = async () => {
-    const mainStore = useMainStore();
+	const mainStore = useMainStore();
-    if (!mainStore.winipBcStart) {
+	if (!mainStore.winipBcStart) {
-        try {
+		try {
-            await invoke("stop_command", { child_id: mainStore.winipBcPid || 0 });
+			await invoke("stop_command", { child_id: mainStore.winipBcPid || 0 });
-            const isExists = await exists("easytier/tool/WinIPBroadcast.exe", { baseDir: BaseDirectory.Resource });
+			const isExists = await exists("easytier/tool/WinIPBroadcast.exe", { baseDir: BaseDirectory.Resource });
-            if(!isExists) {
+			if (!isExists) {
-                ElMessage.error(`WinipBc不存在`);
+				ElMessage.error(`WinipBc不存在`);
-                console.error(`WinipBc不存在`);
+				console.error(`WinipBc不存在`);
-                return;
+				return;
-            }
+			}
-            const child = await Command.create("WinIPBroadcast", ["run"]).spawn();
+			const child = await Command.create("WinIPBroadcast", ["run"]).spawn();
-            mainStore.winipBcPid = child.pid || 0;
+			mainStore.winipBcPid = child.pid || 0;
-            if (mainStore.winipBcPid) {
+			await getWinIpBroadcastPid();
-                mainStore.winipBcStart = true;
+			if (mainStore.winipBcPid) {
-				mainStore.winIpBcAutoStart = true;
+				mainStore.$patch({
-            } else {
+					winIpBcAutoStart: true
-                ElMessage.error(`WinipBc失败`);
+				});
-            }
+			} else {
-        } catch (err) {
+				ElMessage.error(`WinipBc失败`);
-            ElMessage.error(`WinipBc失败`);
+			}
-            console.error(err);
+		} catch (err) {
-        }
+			ElMessage.error(`WinipBc失败`);
-    } else {
+			console.error(err);
-		mainStore.winIpBcAutoStart = false;
+		}
-        await invoke("stop_command", { child_id: mainStore.winipBcPid || 0 });
+	} else {
-        await getWinIpBroadcastPid();
+		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();
+	const mainStore = useMainStore();
-    await getWinIpBroadcastPid();
+	await getWinIpBroadcastPid();
-    // console.error(mainStore.winipBcStart, mainStore.winIpBcAutoStart)
+	// console.error(mainStore.winipBcStart, mainStore.winIpBcAutoStart)
-    if (mainStore.winIpBcAutoStart && !mainStore.winipBcStart) {
+	if (mainStore.winIpBcAutoStart && !mainStore.winipBcStart) {
-        await handleWinipBcStart();
+		await handleWinipBcStart();
-    }
+	}
-};
+};

composables/server.ts

@@ -14,9 +14,8 @@ export const getServerArgs = () => {
 		.split("\n")
 		.map(el => el.trim())
 		.filter(el => el)
-		.join(" ");
 	if (whiteList && mainStore.serverConfig.enableWhiteList) {
-		args.push("--relay-network-whitelist", whiteList);
+		args.push("--relay-network-whitelist", ...whiteList);
 	}
 	if (!whiteList && mainStore.serverConfig.enableWhiteList) {
 		args.push("--relay-network-whitelist");

composables/tray.ts

@@ -5,6 +5,10 @@ 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";
+import { computed } from "vue";
 
 const DEFAULT_TRAY_NAME = "main";
 
@@ -13,6 +17,7 @@ async function toggleVisibility() {
 		await getCurrentWindow().hide();
 	} else {
 		await getCurrentWindow().show();
+		await getCurrentWindow().unminimize();
 		await getCurrentWindow().setFocus();
 	}
 }
@@ -26,13 +31,10 @@ export async function useTray(init: boolean = false, beforExit: Function, handle
 				tooltip: `EasyTierGame\n${pkg.version}`,
 				title: `EasyTierGame\n${pkg.version}`,
 				id: DEFAULT_TRAY_NAME,
-				menu: await Menu.new({
+				menu: await Menu.new({ id: "main", items: await generateMenuItem(beforExit, handleConnection) }),
-					id: "main",
+				action: async e => {
-					items: await generateMenuItem(beforExit, handleConnection),
-				}),
-				action: async (e) => {
 					toggleVisibility();
-				},
+				}
 			});
 		}
 	} catch (error) {
@@ -42,25 +44,22 @@ export async function useTray(init: boolean = false, beforExit: Function, handle
 
 	if (init) {
 		tray.setTooltip(`EasyTierGame\n${pkg.version}`);
-		tray.setMenuOnLeftClick(false);
+		tray.setShowMenuOnLeftClick(false);
-		tray.setMenu(
+		tray.setMenu(await Menu.new({ id: "main", items: await generateMenuItem(beforExit, handleConnection) }));
-			await Menu.new({
-				id: "main",
-				items: await generateMenuItem(beforExit, handleConnection),
-			})
-		);
 	}
 
 	return tray;
 }
 
-export async function generateMenuItem(beforExit: Function, handleConnection:Function) {
+export async function generateMenuItem(beforExit: Function, handleConnection: Function) {
 	return [
 		await MenuItemShow("显示 / 隐藏"),
 		await MenuItemExchangeConnection("联机 / 断开", handleConnection),
 		await MenuItemTheme(),
 		await PredefinedMenuItem.new({ item: "Separator" }),
-		await MenuItemExit("退出", beforExit),
+		await MenuItemPublicPeers(),
+		await PredefinedMenuItem.new({ item: "Separator" }),
+		await MenuItemExit("退出", beforExit)
 	];
 }
 
@@ -73,7 +72,17 @@ export async function MenuItemExit(text: string, beforExit: Function) {
 				await beforExit();
 			}
 			await getCurrentWindow().close();
-		},
+		}
+	});
+}
+
+export async function MenuItemPublicPeers() {
+	return await MenuItem.new({
+		id: "publicPeers",
+		text: "公共节点",
+		action: async () => {
+			await open(import.meta.env.VITE_PUBLIC_PEERS_URL);
+		}
 	});
 }
 
@@ -83,17 +92,17 @@ export async function MenuItemShow(text: string) {
 		text,
 		action: async () => {
 			await toggleVisibility();
-		},
+		}
 	});
 }
 
-export async function MenuItemExchangeConnection(text: string, handleConnection:Function) {
+export async function MenuItemExchangeConnection(text: string, handleConnection: Function) {
-	const menutItem =  await MenuItem.new({
+	const menutItem = await MenuItem.new({
 		id: "exchangeConnection",
 		text,
 		action: async () => {
 			const isStart = await handleConnection();
-		},
+		}
 	});
 	return menutItem;
 }
@@ -104,11 +113,10 @@ export async function MenuItemTheme() {
 		text: "主题切换",
 		action: async () => {
 			const mainStore = useMainStore();
-			mainStore.theme = !mainStore.theme;
+			mainStore.$patch({ theme: !mainStore.theme });
-			// const appWindow = getCurrentWindow();
+			// mainStore.$persist();
-			// appWindow.emitTo("main", "config", { theme: mainStore.theme });
 			await setTheme(mainStore.theme);
-		},
+		}
 	});
 }
 
@@ -140,3 +148,28 @@ export async function setTrayTooltip(tray: TrayIcon | null, tooltip?: string | n
 		await tray.setTooltip(`EasyTierGame\n${pkg.version}`);
 	}
 }
+
+const versionWeight = (version: string) => {
+	version = version ? version.trim() : "";
+	const [major = "0", minor = "0", patch = "0"] = version.split(".");
+	return parseInt(major) * 10000 + parseInt(minor) * 100 + parseInt(patch);
+};
+
+const versionDifference = (current: string, latest: string) => {
+	const currentVersion = versionWeight(current);
+	const latestVersion = versionWeight(latest);
+	return currentVersion - latestVersion;
+};
+
+export const checkNewVersion = async () => {
+	const mainStore = useMainStore();
+	// if(mainStore.latestTagName && mainStore.latestTagName == pkg.version) return;
+	if (hasNewVersion.value) return;
+	let [tagName, downloadUrl] = await invoke<string[]>("fetch_game_releases");
+	mainStore.latestTagName = tagName;
+};
+
+export const hasNewVersion = computed<boolean>(() => {
+	const mainStore = useMainStore();
+	return !!mainStore.latestTagName && versionDifference(pkg.version, mainStore.latestTagName) < 0 ;
+});

composables/windows.ts

@@ -2,17 +2,37 @@ import { type UnlistenFn } from "@tauri-apps/api/event";
 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 useMainStore from "@/stores/index";
+import { onBeforeUnmount } from "vue";
+
+const _listenersMaps: { [key: string]: [UnlistenFn | null] } = {};
+
+const dealCloseListener = async (
+	dialog: WebviewWindow,
+	label: string,
+	beforeCloseFunc?: () => void | null
+) => {
+	const unlistenFnList: [UnlistenFn | null] = _listenersMaps[label] || [null];
+	let [unListenlogClose] = unlistenFnList;
+
+	unListenlogClose && (await unListenlogClose());
+
+	unListenlogClose = await dialog.onCloseRequested(async () => {
+		beforeCloseFunc && (await beforeCloseFunc());
+		unListenlogClose && (await unListenlogClose());
+		console.log("close")
+	});
+};
 export default async (
 	label: WebviewLabel,
 	options?: Omit<WebviewOptions, "x" | "y" | "width" | "height"> & WindowOptions,
 	afterCreatedFunc?: (webviewWindow: WebviewWindow, appWindow: Window) => void | null,
 	beforeCloseFunc?: () => void | null
 ) => {
-	let unListenlogClose: UnlistenFn | null = null;
+	const unlistenFnList: [UnlistenFn | null] = _listenersMaps[label] || [null];
-	let unlistenLogCreated: UnlistenFn | null = null;
 	let dialog = await WebviewWindow.getByLabel(label);
 	if (!dialog) {
-		let defaultOpts: {[key:string]: any, parent: Window | undefined} = {
+		let defaultOpts: { [key: string]: any; parent: Window | undefined } = {
 			parent: undefined,
 			closable: true,
 			resizable: true,
@@ -25,11 +45,8 @@ export default async (
 		const appWindow = getCurrentWindow();
 		if (appWindow) {
 			const appSize = await appWindow.outerSize();
-			// const monitor = await currentMonitor();
-			// console.error(monitor)
 			const factor = await appWindow.scaleFactor();
 			const appPosition = await appWindow.outerPosition();
-			// console.error((appPosition.x + appSize.width) / 1.25);
 			const logicalPosition = new PhysicalPosition(appPosition.x + appSize.width, appPosition.y).toLogical(factor);
 			defaultOpts.parent = appWindow;
 			// console.error(logicalPosition);
@@ -37,21 +54,40 @@ export default async (
 			defaultOpts.y = logicalPosition.y;
 		}
 		dialog = new WebviewWindow(label, { ...defaultOpts, ...options });
-		unlistenLogCreated = await dialog.once("tauri://webview-created", async () => {
+		await dealCloseListener(dialog, label, beforeCloseFunc);
-			if (dialog) {
+		afterCreatedFunc && (await afterCreatedFunc(dialog, appWindow));
-				afterCreatedFunc && (await afterCreatedFunc(dialog, appWindow));
+		await dialog.show();
-				await dialog.show();
+
-			}
-		});
-		unListenlogClose = await dialog.onCloseRequested(async () => {
-			beforeCloseFunc && (await beforeCloseFunc());
-			unListenlogClose && (await unListenlogClose());
-		});
 	} else {
 		const visible = await dialog.isVisible();
 		if (visible) {
 			await dialog.close();
-			unlistenLogCreated && (await (unlistenLogCreated as Function)());
+		} else {
+			const appWindow = getCurrentWindow();
+			await dealCloseListener(dialog, label, beforeCloseFunc);
+			afterCreatedFunc && (await afterCreatedFunc(dialog, appWindow));
+			await dialog.show();
 		}
 	}
 };
+
+export const dataSubscribe = async (cb?: (...args: any) => any) => {
+	if (!cb) return;
+	const mainStore = useMainStore();
+	const abort = new AbortController();
+	window.addEventListener(
+		"storage",
+		async () => {
+			mainStore.$hydrate();
+			if (cb && cb instanceof Function) {
+				await cb();
+			}
+		},
+		{
+			signal: abort.signal
+		}
+	);
+	onBeforeUnmount(() => {
+		abort?.abort();
+	});
+};

env/.env.dev

@@ -1,5 +1,8 @@
 VITE_CONFIG_PATH=easytier/config/
+VITE_CONFIG_ADMIN_PATH=easytier/config/.admin/
 VITE_CONFIG_FILE_NAME=easytier/config.json
 VITE_LOG_PATH=easytier/logs/
 VITE_CACHE_PATH=easytier/cache/
+VITE_GAME_LIST_PATH=easytier/gameList/
+VITE_PUBLIC_PEERS_URL=https://easytier.gd.nkbpal.cn/status/easytier
 VITE_AUTO_START_SERVICE_NAME=easytierGameAutoStart

env/.env.prod

@@ -1,5 +1,8 @@
 VITE_CONFIG_PATH=easytier/config/
+VITE_CONFIG_ADMIN_PATH=easytier/config/.admin/
 VITE_CONFIG_FILE_NAME=easytier/config.json
 VITE_LOG_PATH=easytier/logs/
 VITE_CACHE_PATH=easytier/cache/
+VITE_GAME_LIST_PATH=easytier/gameList/
+VITE_PUBLIC_PEERS_URL=https://easytier.gd.nkbpal.cn/status/easytier
 VITE_AUTO_START_SERVICE_NAME=easytierGameAutoStart

layouts/default.vue

@@ -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();
 		}
 	});

nuxt.config.ts

@@ -9,6 +9,8 @@ export default defineNuxtConfig({
 		port: 5000
 	},
 
+	telemetry: false,
+
 	imports: {
 		autoImport: false
 	},

package.json

@@ -3,39 +3,39 @@
 	"private": true,
 	"author": "leizi97",
 	"description": "A simple network initiator based on Easytier",
-	"version": "1.2.7",
+	"version": "1.4.4",
 	"scripts": {
 		"dev": "nuxt dev --dotenv env/.env.dev --host 0.0.0.0",
 		"build": "nuxt generate --dotenv env/.env.prod",
-		"release": "node zip.js"
+		"release": "node zip.js",
+		"release-win7": "node zip.js win7"
 	},
 	"devDependencies": {
 		"@element-plus/icons-vue": "^2.3.1",
-		"@element-plus/nuxt": "^1.1.0",
+		"@element-plus/nuxt": "1.1.1",
-		"@nuxtjs/tailwindcss": "^6.12.0",
+		"@nuxtjs/tailwindcss": "6.13.2",
-		"@pinia/nuxt": "^0.7.0",
+		"@pinia/nuxt": "0.11.0",
-		"@tauri-apps/api": "^2.1.1",
+		"@tauri-apps/api": "2.5.0",
-		"@tauri-apps/cli": "^2.1.0",
+		"@tauri-apps/cli": "2.5.0",
-		"@tauri-apps/plugin-autostart": "~2",
+		"@tauri-apps/plugin-cli": "^2.2.0",
-		"@tauri-apps/plugin-cli": "^2.0.0",
+		"@tauri-apps/plugin-clipboard-manager": "2.2.2",
-		"@tauri-apps/plugin-clipboard-manager": "^2.0.0",
+		"@tauri-apps/plugin-dialog": "2.2.1",
-		"@tauri-apps/plugin-fs": "~2",
+		"@tauri-apps/plugin-fs": "2.2.1",
-		"@tauri-apps/plugin-http": "^2.0.1",
+		"@tauri-apps/plugin-log": "2.3.1",
-		"@tauri-apps/plugin-log": "^2.0.0",
+		"@tauri-apps/plugin-shell": "2.2.1",
-		"@tauri-apps/plugin-shell": "~2",
+		"@tauri-apps/plugin-window-state": "2.2.2",
-		"@tauri-apps/plugin-window-state": "~2",
 		"@types/lodash-es": "^4.17.12",
-		"@vitejs/plugin-vue-jsx": "^4.1.0",
+		"@vitejs/plugin-vue-jsx": "4.1.2",
-		"@vueuse/core": "^11.2.0",
+		"@vueuse/core": "12.7.0",
 		"archiver": "^7.0.1",
-		"element-plus": "^2.8.7",
+		"element-plus": "2.9.10",
-		"less": "^4.2.0",
+		"less": "4.2.1",
 		"lodash-es": "^4.17.21",
-		"nuxt": "^3.14.1592",
+		"nuxt": "3.17.2",
-		"pinia": "^2.2.6",
+		"pinia": "3.0.2",
-		"pinia-plugin-persistedstate": "^4.1.3",
+		"pinia-plugin-persistedstate": "^4.2.0",
 		"postcss": "^8.4.38",
-		"typescript": "^5.6.3",
+		"prettier": "3.5.2",
-		"vue-clipboard3": "^2.0.0"
+		"prettier-plugin-tailwindcss": "0.6.11"
 	}
 }

pages/advance.vue

@@ -1,8 +1,264 @@
 <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="弱网环境下可能会导致网络延迟延迟忽高忽低">
+				<ElIcon><QuestionFilled /></ElIcon>
+			</ElTooltip>
+		</div>
+		<div class="flex flex-nowrap items-center gap-[5px]">
+			<ElCheckbox v-model="mainStore.config.enableKcpProxy">启用KCP代理</ElCheckbox>
+			<ElTooltip content="将TCP流量转为KCP流量，降低传输延迟，提升传输速度">
+				<ElIcon><QuestionFilled /></ElIcon>
+			</ElTooltip>
+			<CoreVersionWarning version="2.2.0" />
+		</div>
+		<div class="flex flex-nowrap items-center gap-[5px]">
+			<ElCheckbox v-model="mainStore.config.disableKcpInput">禁用KCP输入</ElCheckbox>
+			<ElTooltip content="禁用KCP入站流量，其他开启KCP代理的节点无法连接到本节点">
+				<ElIcon><QuestionFilled /></ElIcon>
+			</ElTooltip>
+			<CoreVersionWarning version="2.2.0" />
+		</div>
+		<div><ElCheckbox v-model="mainStore.config.disableUdpHolePunching">禁用UDP打洞功能</ElCheckbox></div>
 		<div><ElCheckbox v-model="mainStore.config.disableIpv6">不使用IPv6</ElCheckbox></div>
-		<div><ElCheckbox v-model="mainStore.config.disbleListenner">不监听任何端口，只连接到对等节点</ElCheckbox></div>
+		<ElDivider />
-		<div class="flex items-center gap-[15px] flex-nowrap">
+		<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"
+				:model-value="mainStore.config.enableCustomListenerV6"
+				@change="handleCustomListenerV6Change"
+			>
+				自定义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端口上监听(内核版本2.2.3之后，ipv6监听被移除并合并到'自定义监听')">
+				<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
+				size="small"
+				maxlength="10"
+				v-model="mainStore.config.devNameValue"
+				placeholder="请输入虚拟网卡名称"
+			/>
+		</div>
+		<div class="flex items-center gap-[10px]">
+			<ElCheckbox v-model="mainStore.config.enableNetCardMetric">自定义虚拟网卡优先级</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="数值越小，优先级越高">
+				<ElIcon><QuestionFilled /></ElIcon>
+			</ElTooltip>
+		</div>
+		<div>
+			<ElText
+				size="small"
+				type="warning"
+			>
+				(不使用自定义虚拟网卡名称,那么联机时默认会生成一个名为 "et_xxx" 的网卡，也可以使用 “自定义虚拟网卡优先级”
+				功能，除非你启用了下面的功能)
+			</ElText>
+		</div>
+
+		<div class="flex items-center gap-[5px]">
+			<ElCheckbox v-model="mainStore.config.noTun">不创建TUN虚拟网卡</ElCheckbox>
+
+			<ElTooltip content="开启后该节点无法主动访问其他节点">
+				<ElIcon><QuestionFilled /></ElIcon>
+			</ElTooltip>
+		</div>
+
+		<div class="flex items-center gap-[5px]">
+			<div><ElCheckbox v-model="mainStore.config.bindDeviceEnable">绑定物理网卡</ElCheckbox></div>
+			<!-- <div class="flex items-center gap-[5px]"> -->
+			<!-- <ElSelect
+					placeholder="选择设备"
+					v-model="mainStore.config.bindDevice"
+					filterable
+					no-data-text="暂无网卡设备数据，请刷新"
+				>
+					<ElOption
+						v-for="guid in guids"
+						:key="guid[0]"
+						:label="guid[1]"
+						:value="guid[0]"
+					></ElOption>
+				</ElSelect> -->
+			<!-- <ElButton @click="getGuids">刷新</ElButton> -->
+			<ElTooltip content="将连接器的套接字绑定到物理设备以避免路由问题。比如子网代理网段与某节点的网段冲突，绑定物理设备后可以与该节点正常通信">
+				<ElIcon><QuestionFilled /></ElIcon>
+			</ElTooltip>
+			<!-- </div> -->
+			<CoreVersionWarning version="2.2.3" />
+		</div>
+
+		<ElDivider />
+		<div><ElCheckbox v-model="mainStore.config.enablExitNode">允许此节点成为出口节点</ElCheckbox></div>
+		<div class="flex items-center gap-[5px]">
+			<ElCheckbox v-model="mainStore.config.disableEncryption">关闭信息加密</ElCheckbox>
+			<ElTooltip content="关闭后通信数据将在互联网上明文传输，如房间名和密码">
+				<ElIcon><QuestionFilled /></ElIcon>
+			</ElTooltip>
+		</div>
+		<div class="flex items-center gap-[5px]">
+			<ElCheckbox v-model="mainStore.config.multiThread">开启多线程</ElCheckbox>
+			<ElTooltip content="开启后可能会提高网络性能">
+				<ElIcon><QuestionFilled /></ElIcon>
+			</ElTooltip>
+		</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 class="flex items-center gap-[10px]">
+			<ElCheckbox v-model="mainStore.config.useSmoltcp">为子网代理和 KCP 代理开启用户网络栈</ElCheckbox>
+			<ElTooltip content="开启后会降低网络性能，但不需要配置防火墙">
+				<ElIcon><QuestionFilled /></ElIcon>
+			</ElTooltip>
+		</div>
+		<div class="flex flex-nowrap items-center gap-[15px]">
 			<ElCheckbox v-model="mainStore.config.saveErrorLog">输出日志到本地</ElCheckbox>
 			<div class="w-[140px]">
 				<ElSelect
@@ -26,80 +282,53 @@
 				打开日志目录
 			</ElButton>
 		</div>
-		<div><ElCheckbox v-model="mainStore.config.connectAfterStart">软件启动后，自动"启动联机"(搭配开机自启，无感联机)</ElCheckbox></div>
-		<div class="flex items-center gap-[15px] flex-nowrap">
-			<ElCheckbox v-model="mainStore.createConfigInEasytier">自动生成界面配置文件easytier/config.json</ElCheckbox>
-			<ElButton
-				@click="openConfigJsonDir"
-				size="small"
-			>
-				打开config.json目录
-			</ElButton>
-		</div>
-
-		<ElDivider />
-		<div class="flex items-center gap-[10px]">
-			<ElCheckbox v-model="mainStore.config.devName">自定义网卡名</ElCheckbox>
-			<ElInput
-				size="small"
-				maxlength="10"
-				v-model="mainStore.config.devNameValue"
-				placeholder="请输入网卡名"
-			/>
-		</div>
-		<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>
-		<ElDivider />
-
-		<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 { QuestionFilled } from "@element-plus/icons-vue";
-	import { getCurrentWindow } from "@tauri-apps/api/window";
 	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, ref } from "vue";
+	import { dataSubscribe } from "@/composables/windows";
+	import { ATJ, supportProtocols } from "~/utils";
+	import CoreVersionWarning from "@/components/CoreVersionWarning.vue";
+	import { ElConfirmDanger } from "~/utils/element";
+	import { invoke } from "@tauri-apps/api/core";
+
+	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 handleCustomListenerV6Change = async (value: boolean) => {
+	// 	if (value) {
+	// 		const [error, _] = await ElConfirmDanger("内核版本2.2.3之后，ipv6监听被移除并合并到'自定义监听'，请谨慎使用", "警告", {
+	// 			confirmButtonText: "继续使用",
+	// 			cancelButtonText: "取消"
+	// 		});
+	// 		if (!error) {
+	// 			mainStore.config.enableCustomListenerV6 = value;
+	// 		}
+	// 	} else {
+	// 		mainStore.config.enableCustomListenerV6 = value;
+	// 	}
+	// };
 
 	const mainStore = useMainStore();
-	const appWindow = getCurrentWindow();
 	const data = ["trace", "debug", "info", "warn", "error", "off"];
+	const guids = ref<string[][]>([]);
 	const openLogDir = async () => {
 		const resourceDir = await getResourceDir();
 		const logPath = import.meta.env.VITE_LOG_PATH;
@@ -112,6 +341,7 @@
 		}
 		await Command.create("explorer", [logDirPath]).execute();
 	};
+
 	const openConfigJsonDir = async () => {
 		const resourceDir = await getResourceDir();
 		const easytierDir = await join(resourceDir, "easytier/");
@@ -122,11 +352,32 @@
 			ElMessage.error("config.json的目录不存在");
 		}
 	};
-	mainStore.$subscribe(async (...a) => {
+
-		// console.error("subscribe", a);
+	// 为bind_device功能增加改方法
-		await appWindow.emitTo("main", "config", { config: { ...mainStore.config }, createConfigInEasytier: mainStore.createConfigInEasytier });
+	const getGuids = async () => {
-		// if(mainStore.createConfigInEasytier) {
+		const guidsValue = await invoke<string[][]>("get_network_adapter_guids");
-		// 	updateConfigJson();
+		guids.value = guidsValue && guidsValue.length > 0 ? guidsValue : [];
-		// }
+	};
+
+	dataSubscribe(async () => {
+		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("删除失败，请打开目录手动删除");
+					}
+				}
+			}
+		}
 	});
 </script>

pages/cidr.vue

@@ -1,25 +1,122 @@
 <template>
-	<div class="h-full flex flex-col gap-[10px]">
+	<div class="flex h-full flex-col gap-[10px]">
-		<ElRadioGroup v-model="mainStore.cidrEnable">
+		<div class="flex items-center gap-[10px]">
-			<ElRadioButton :value="true">开启</ElRadioButton>
+			<ElRadioGroup
-			<ElRadioButton :value="false">关闭</ElRadioButton>
+				:disabled="!data.isSwitchEnable"
-		</ElRadioGroup>
+				v-model="mainStore.cidrEnable"
+			>
+				<ElRadioButton :value="true">开启</ElRadioButton>
+				<ElRadioButton :value="false">关闭</ElRadioButton>
+			</ElRadioGroup>
+			<div class="flex items-center gap-[10px]">
+				<ElCheckbox v-model="mainStore.proxyForwardBySystem">通过系统内核转发子网代理数据包，禁用内置NAT</ElCheckbox>
+				<CoreVersionWarning version="2.2.3" />
+			</div>
+		</div>
 		<div class="flex-1 overflow-auto">
 			<ElInput
 				placeholder="例如: 192.168.1.0/24 一行一个"
 				v-model="mainStore.config.proxyNetworks"
 				type="textarea"
-				:rows="30"
+				:rows="5"
-				resize="none"></ElInput>
+				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) => {
+	const data = reactive<{ [key: string]: any }>({
-		appWindow.emitTo("main", "config", { cidrEnable: mainStore.cidrEnable, config: { ...mainStore.config } });
+		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();
+		dataSubscribe();
+	});
+
+	onBeforeUnmount(() => {
+		unlistenStart && unlistenStart();
 	});
 </script>

pages/gameList.vue

@@ -0,0 +1,533 @@
+<template>
+	<div class="relative flex h-full flex-col flex-wrap gap-[0] overflow-hidden">
+		<div class="flex h-[40px] w-full flex-nowrap items-center gap-[0_5px]">
+			<div class="ml-[5px] mr-auto flex flex-1">
+				<ElInput
+					size="small"
+					v-model="searchValue"
+					placeholder="请输入游戏名进行查询"
+				></ElInput>
+			</div>
+			<div>
+				<ElButton
+					:icon="Plus"
+					size="small"
+					type="primary"
+					class="mr-[5px]"
+					@click="handleCreate"
+				>
+					新增游戏
+				</ElButton>
+				<ElButton
+					size="small"
+					class="!ml-[0px] mr-[5px]"
+					@click="openCoverDir"
+				>
+					封面目录
+				</ElButton>
+			</div>
+		</div>
+		<div class="flex flex-1 flex-wrap gap-[0] overflow-auto">
+			<div
+				v-for="(item, idx) in computedGameList"
+				:key="item.id"
+				class="w-[25%] p-[4px]"
+			>
+				<div class="group/card relative">
+					<ElCard>
+						<template #header>
+							<div class="flex flex-nowrap gap-[0_8px]">
+								<ElTooltip :content="item.name" placement="top">
+									<p class="ml-auto flex-1 truncate">
+										<ElText
+											size="default"
+											type="info"
+										>
+											{{ item.name }}
+										</ElText>
+									</p>
+								</ElTooltip>
+							</div>
+						</template>
+						<img
+							:src="showImgConvertFileSrc(item.showImg)"
+							@error="handleImgError(item, idx)"
+							class="aspect-[1] w-full object-cover"
+						/>
+					</ElCard>
+					<div
+						class="absolute left-0 top-[61px] z-[1] hidden h-[calc(100%-61px)] w-full flex-col items-center justify-center rounded-[5px] bg-[var(--el-mask-color)] group-hover/card:flex"
+					>
+						<ElButton
+							size="large"
+							type="success"
+							:icon="VideoPlay"
+							@click.stop="handleStartGame(item)"
+						>
+							启动游戏
+						</ElButton>
+						<div class="pt-[5px]">
+							<ElButton
+								size="small"
+								type="info"
+								:icon="EditPen"
+								title="修改"
+								@click.stop="handleEditItem(item)"
+							/>
+							<ElButton
+								size="small"
+								type="danger"
+								:icon="DeleteFilled"
+								title="删除"
+								@click.stop="handleDeleteItem(item)"
+							/>
+						</div>
+					</div>
+				</div>
+			</div>
+
+			<div class="w-[25%] p-[4px]">
+				<ElTooltip content="新增本地游戏">
+					<ElCard
+						@click.stop="handleCreate"
+						shadow="hover"
+					>
+						<div class="group/plus flex cursor-pointer flex-col items-center justify-center py-[25px]">
+							<ElIcon class="!text-[80px] transition-all group-hover/plus:text-[color:var(--el-color-primary)]">
+								<Plus></Plus>
+							</ElIcon>
+							<div>
+								<ElText>支持从桌面拖放新增</ElText>
+							</div>
+						</div>
+					</ElCard>
+				</ElTooltip>
+			</div>
+		</div>
+		<ElDialog
+			width="95%"
+			top="30px"
+			append-to-body
+			:z-index="10"
+			class="!mb-0"
+			v-model="createGameData.visible"
+			:close-on-press-escape="false"
+			:title="`${createGameData.isEdit ? '编辑' : '新建'}本地游戏`"
+		>
+			<ElForm
+				hide-required-asterisk
+				label-position="left"
+				:model="createGameData.form"
+				:rules="createGameData.rules"
+				ref="formRef"
+			>
+				<ElFormItem
+					label="游戏名字"
+					prop="name"
+				>
+					<ElInput
+						v-model="createGameData.form.name"
+						placeholder="请输入游戏名字"
+					></ElInput>
+				</ElFormItem>
+				<ElFormItem
+					label="执行文件"
+					prop="exePath"
+				>
+					<ElInput
+						v-model="createGameData.form.exePath"
+						placeholder="请选择游戏执行文件"
+					>
+						<template #append>
+							<ElButton
+								size="small"
+								type="primary"
+								@click.stop="handleBrowser('exePath')"
+							>
+								浏览
+							</ElButton>
+						</template>
+					</ElInput>
+				</ElFormItem>
+				<ElFormItem
+					label="游戏封面"
+					prop="showImg"
+				>
+					<ElBadge :hidden="createGameData.form.showImg == defaultPng">
+						<template #content="{ value }">
+							<div
+								class="cursor-pointer"
+								@click.stop="handleBadgeDeleteCover"
+							>
+								<ElIcon>
+									<DeleteFilled />
+								</ElIcon>
+							</div>
+						</template>
+						<img
+							@click.stop="handleBrowser('showImg')"
+							:src="showImgConvertFileSrc(createGameData.form.showImg)"
+							class="aspect-[1] w-[120px] cursor-pointer object-cover"
+						/>
+					</ElBadge>
+				</ElFormItem>
+			</ElForm>
+			<template #footer>
+				<div><ElText type="warning">除了默认封面以外，自定义封面会集中保存在封面目录里</ElText></div>
+				<ElButton
+					size="default"
+					type="primary"
+					@click="handleSave"
+				>
+					保存
+				</ElButton>
+				<ElButton
+					size="default"
+					@click="createGameData.visible = false"
+				>
+					关闭
+				</ElButton>
+			</template>
+		</ElDialog>
+	</div>
+</template>
+<script lang="ts" setup>
+	import { VideoPlay, DeleteFilled, EditPen, Plus, Delete } from "@element-plus/icons-vue";
+	import { dataSubscribe } from "~/composables/windows";
+	import { BaseDirectory, basename, extname, resourceDir as getResourceDir, join } from "@tauri-apps/api/path";
+	import { convertFileSrc, Resource } from "@tauri-apps/api/core";
+	import { computed, nextTick, onBeforeUnmount, onMounted, reactive, ref, useTemplateRef } from "vue";
+	import useMainStore from "@/stores/index";
+	import { uniqueId } from "lodash-es";
+	import { open as dialogOpen } from "@tauri-apps/plugin-dialog";
+	import { ElMessage, type FormInstance } from "element-plus";
+	import { ATJ, bounce } from "~/utils";
+	import { ElConfirmDanger } from "~/utils/element";
+	import { copyFile, exists, mkdir, readDir, remove } from "@tauri-apps/plugin-fs";
+	import { Command, open } from "@tauri-apps/plugin-shell";
+	import { listen, type UnlistenFn } from "@tauri-apps/api/event";
+
+	const resourceDir = await getResourceDir();
+	const gameListResourceDir = await join(resourceDir, import.meta.env.VITE_GAME_LIST_PATH);
+	// const defaultLocalIconPath = await join(configPath, "icon.png");
+	// const tauriPath = convertFileSrc(defaultLocalIconPath);
+	const mainStore = useMainStore();
+	const formEl = useTemplateRef<FormInstance>("formRef");
+	const searchValue = ref("");
+	const defaultPng = "/default.png";
+	// const b = bounce(600);
+	type gameItemType = { name: string; exePath: string; id: string; showImg: string };
+	const createGameData = reactive({
+		visible: false,
+		isEdit: false,
+		form: {
+			id: "",
+			name: "",
+			exePath: "",
+			showImg: defaultPng
+		},
+		rules: {
+			name: [{ required: true, message: "请输入游戏名", trigger: "blur" }],
+			exePath: [{ required: true, message: "请选择游戏执行文件", trigger: "blur" }]
+		}
+	});
+
+	const computedGameList = computed(() => {
+		if (!searchValue.value.trim()) return mainStore.gameList;
+		return mainStore.gameList.filter(item => {
+			return item.name.includes(searchValue.value); // 过滤
+		});
+	});
+
+	const handleCreate = async () => {
+		createGameData.isEdit = false;
+		createGameData.form = {
+			id: "",
+			name: "",
+			exePath: "",
+			showImg: defaultPng
+		};
+		await nextTick();
+		createGameData.visible = true;
+	};
+
+	const handleBrowser = async (type: "showImg" | "exePath") => {
+		const filters = type === "showImg" ? [{ name: "", extensions: ["png", "jpg", "jpeg"] }] : [{ name: "", extensions: ["exe"] }];
+		const file = await dialogOpen({
+			multiple: false,
+			directory: false,
+			filters
+		});
+		if (file) {
+			if (type === "showImg") {
+				if (file) {
+					if (!createGameData.form.id) {
+						const time = new Date().getTime();
+						createGameData.form.id = uniqueId(`${time}`);
+					}
+					let showImg = file;
+					const game_list_path = import.meta.env.VITE_GAME_LIST_PATH;
+					const isExists = await exists(game_list_path, { baseDir: BaseDirectory.Resource });
+					if (!isExists) {
+						try {
+							await mkdir(game_list_path, { baseDir: BaseDirectory.Resource });
+						} catch (err) {}
+					}
+					const toPath = await join(gameListResourceDir, createGameData.form.id);
+					const suffix = showImg.split(".").pop();
+					const toPathFileName = `${toPath}.${suffix}`;
+					if (showImg != toPathFileName) {
+						await copyFile(showImg, toPathFileName);
+					}
+					// console.log(toPathFileName);
+					const isExistsToPath = await exists(toPathFileName);
+					if (isExistsToPath) {
+						const baseName = await basename(toPathFileName);
+						createGameData.form = { ...createGameData.form, showImg: `${baseName}` }; // 如果复制正确，那就存储文件名即可
+					}
+				}
+			}
+			if (type === "exePath") {
+				createGameData.form.exePath = file;
+			}
+		} else {
+			ElMessage.error("获取文件路径失败");
+		}
+	};
+
+	const openCoverDir = async () => {
+		const game_list_path = import.meta.env.VITE_GAME_LIST_PATH;
+		const isExists = await exists(game_list_path, { baseDir: BaseDirectory.Resource });
+		if (!isExists) {
+			try {
+				await mkdir(game_list_path, { baseDir: BaseDirectory.Resource });
+			} catch (err) {}
+		}
+		await Command.create("explorer", [gameListResourceDir]).execute();
+	};
+
+	const handleSave = async () => {
+		const [error, _] = await ATJ(formEl.value?.validate() as Promise<boolean>);
+		if (!error) {
+			if (createGameData.form.showImg == defaultPng) {
+				//删除本地封面图
+				// const toPath = await join(gameListResourceDir, createGameData.form.id);
+				// const imgPath = `${toPath}.${suffix}`;
+				// await remove(imgPath);
+			}
+
+			const idx = mainStore.gameList.findIndex(i => i.id == createGameData.form.id);
+			if (idx >= 0) {
+				mainStore.gameList[idx] = { ...createGameData.form };
+				mainStore.$patch({
+					gameList: [...mainStore.gameList]
+				});
+			} else {
+				mainStore.$patch({
+					gameList: [...mainStore.gameList, createGameData.form]
+				});
+			}
+
+			ElMessage.success("保存成功");
+			createGameData.visible = false;
+			// await Command.create("explorer", [gameListResourceDir]).execute();
+		}
+	};
+
+	const handleBadgeDeleteCover = async () => {
+		await removeFileById(createGameData.form.id);
+		createGameData.form = { ...createGameData.form, showImg: defaultPng };
+	};
+
+	const removeFileById = async (id: string) => {
+		if (!id) return;
+		const isExists = await exists(gameListResourceDir);
+		if (!isExists) return;
+		const entries = await readDir(gameListResourceDir);
+		if (entries.length > 0) {
+			for (const entry of entries) {
+				if (entry.name.includes(id + ".")) {
+					const imgPath = await join(gameListResourceDir, entry.name);
+					const isExists = await exists(imgPath);
+					if (!isExists) continue;
+					await remove(imgPath);
+				}
+			}
+		}
+	};
+
+	const handleDeleteItem = async ({ id }: gameItemType) => {
+		if (id) {
+			const [error, _] = await ElConfirmDanger("确定要删除吗？");
+			if (!error) {
+				await removeFileById(id);
+				mainStore.$patch({
+					gameList: mainStore.gameList.filter(i => i.id !== id)
+				});
+			}
+		}
+	};
+
+	const handleEditItem = async (item: gameItemType) => {
+		createGameData.isEdit = true;
+		createGameData.form = { ...item };
+		createGameData.visible = true;
+	};
+
+	const handleStartGame = async (item: gameItemType) => {
+		try {
+			const isExists = await exists(item.exePath);
+			if (!isExists) {
+				return ElMessage.error("执行文件不存在");
+			}
+		} catch (err) {
+			return ElMessage.error("执行文件不存在");
+		}
+
+		ElMessage.info("正在启动游戏，请稍后...");
+		const _child = await open(item.exePath);
+	};
+
+	const handleImgError = (item: gameItemType, idx: number) => {
+		item.showImg = defaultPng;
+		mainStore.gameList[idx] = { ...item };
+		mainStore.$patch({
+			gameList: [...mainStore.gameList]
+		});
+	};
+
+	const showImgConvertFileSrc = (showImg: string) => {
+		if (showImg == defaultPng) return defaultPng;
+		showImg = /^[a-z]\:/g.test(showImg.toLowerCase())
+			? `${convertFileSrc(showImg)}?${new Date().getTime()}`
+			: `${convertFileSrc(`${gameListResourceDir}\\${showImg}`)}?${new Date().getTime()}`;
+		return showImg;
+	};
+
+	let unlistenDragDrop: UnlistenFn | null = null;
+	const listenDragDrop = async () => {
+		unlistenDragDrop = await listen<{ paths: string[]; position: { x: number; y: number } }>("tauri://drag-drop", async e => {
+			const AllFiles = e.payload.paths;
+			let result: Array<gameItemType> = [];
+			const date = new Date().getTime();
+			const showImg = defaultPng;
+			const extUrls = [];
+			const lnkFiles = [];
+			for (const item of AllFiles) {
+				if (item.endsWith(".url")) {
+					extUrls.push(item);
+				} else {
+					lnkFiles.push(item);
+				}
+			}
+
+			if (lnkFiles.length > 0) {
+				// console.log(lnkFiles)
+				let lnkFilesstr = "$lnkFiles = @(";
+				for (let i = 0; i < lnkFiles.length; i++) {
+					lnkFilesstr = lnkFilesstr + `\"${lnkFiles[i]}\"`;
+					if (i == lnkFiles.length - 1) {
+						lnkFilesstr = lnkFilesstr + ");";
+					} else {
+						lnkFilesstr = lnkFilesstr + ",";
+					}
+				}
+				let forstr =
+					lnkFilesstr +
+					`
+					$shell = New-Object -ComObject WScript.Shell;
+					$results = @();
+					foreach ($lnkFile in $lnkFiles) {
+						$shortcut = $shell.CreateShortcut($lnkFile);
+						$targetPath = $shortcut.TargetPath;
+						$iconLocation = $shortcut.IconLocation;
+						$results += [PSCustomObject]@{
+							TargetPath = $targetPath
+							LinkFile = $lnkFile
+						};
+					};
+					$results | ConvertTo-Json
+				`;
+				let outputtarget = await Command.create("powershell", [`${forstr}`], {
+					encoding: "GBK"
+				}).execute();
+				let res: {
+					TargetPath: string;
+					LinkFile: string;
+				}[] = JSON.parse(outputtarget.stdout);
+				if (res && !Array.isArray(res)) {
+					res = [res];
+				}
+				if (res.length > 0) {
+					for (const idx in res) {
+						const item = res[idx];
+						// console.log(item);
+						const id = `${date}-${idx}`;
+						const exePath = item.TargetPath || item.LinkFile;
+						const namePath = item.LinkFile || item.TargetPath;
+						const allName = await basename(namePath);
+						const extName = await extname(namePath);
+						result.push({
+							exePath: exePath,
+							name: allName.replace(`.${extName}`, ""),
+							id,
+							showImg
+						});
+					}
+				}
+			}
+			if (extUrls.length > 0) {
+				for (const idx in extUrls) {
+					const TargetPath = extUrls[idx];
+					const id = `${date}-${idx}-url`;
+					const allName = await basename(TargetPath);
+					const extName = await extname(TargetPath);
+					result.push({
+						exePath: TargetPath,
+						name: allName.replace(`.${extName}`, ""),
+						id,
+						showImg
+					});
+				}
+			}
+
+			if (result.length > 0) {
+				mainStore.$patch({
+					gameList: [...mainStore.gameList, ...result]
+				});
+			}
+		});
+	};
+
+	// 兼容新的存储方式
+	const compatibleGameList = async () => {
+		const gameList = [...mainStore.gameList];
+		if(gameList.length <= 0) return;
+		const newGameList = [];
+		for(const item of gameList) {
+			const newItem = {...item}
+			if(newItem.showImg != defaultPng && /^[a-z]\:/g.test(newItem.showImg.toLowerCase())) {
+				newItem.showImg = await basename(item.showImg);
+				if(Reflect.has(newItem, "coverImg")) {
+					delete newItem['coverImg'];
+				}
+			}
+			newGameList.push(newItem);
+		}
+		mainStore.$patch({
+			gameList: newGameList
+		})
+	}
+
+	onMounted(async () => {
+		await compatibleGameList();
+		listenDragDrop(); //监听拖放
+	});
+
+	onBeforeUnmount(() =>{
+		unlistenDragDrop && unlistenDragDrop();
+	})
+
+
+	dataSubscribe();
+</script>

pages/log.vue

@@ -16,8 +16,8 @@
 	});
 
 	const listenStart = async () => {
-		const unListen = await listen("logs", event => {
+		const unListen = await listen<string>("logs", event => {
-			data.log = (event.payload as string) || "";
+			data.log = event.payload || "";
 		});
 		return unListen;
 	};

pages/member.vue

@@ -1,7 +1,12 @@
 <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
@@ -11,21 +16,30 @@
 				<ElTableColumn
 					sortable
 					width="140"
-					label="主机名"
+					label="成员名"
 					prop="hostname"
-				></ElTableColumn>
+				>
+					<template #default="{ row }">
+						{{
+							(row.hostname || "").toLowerCase().includes("publicserver")
+								? (row.hostname || "").replace("PublicServer", "服务器")
+								: row.hostname || "-"
+						}}
+					</template>
+				</ElTableColumn>
 				<ElTableColumn
 					sortable
 					width="90"
 					prop="cost"
-					label="路由"
+					label="方式"
 				>
 					<template #default="{ row }">
 						<ElTag
+							size="small"
 							effect="dark"
 							:type="row.cost == 'p2p' ? 'success' : 'info'"
 						>
-							{{ row.cost }}
+							{{ row.cost ? row.cost.replace("relay", "中转").replace("p2p", "直连") : row.cost }}
 						</ElTag>
 					</template>
 				</ElTableColumn>
@@ -38,12 +52,16 @@
 				<ElTableColumn
 					sortable
 					prop="lat_ms"
-					width="130"
+					width="100"
 					label="延迟/ms"
-				></ElTableColumn>
+				>
+					<template #default="{ row }">
+						{{ row.lat_ms && !isNaN(Number(row.lat_ms)) ? Number(row.lat_ms).toFixed(0) : row.lat_ms || "-" }}
+					</template>
+				</ElTableColumn>
 				<ElTableColumn
 					sortable
-					width="120"
+					width="100"
 					prop="loss_rate"
 					label="丢包率"
 				>
@@ -53,9 +71,9 @@
 				</ElTableColumn>
 				<ElTableColumn
 					sortable
-					width="120"
+					width="110"
-					label="nat_type"
+					label="NAT类型"
-					prop="NAT类型"
+					prop="nat_type"
 				>
 					<template #default="{ row }">
 						{{ natMaps[row.nat_type.toLowerCase() as natKyes] || row.nat_type || "-" }}
@@ -63,15 +81,27 @@
 				</ElTableColumn>
 				<ElTableColumn
 					sortable
-					width="120"
+					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>
@@ -79,9 +109,10 @@
 <script setup lang="ts">
 	import { invoke } from "@tauri-apps/api/core";
 	import { reactive, onMounted, onBeforeUnmount } from "vue";
-	import { ATJ, parsePeerInfo } from "@/utils";
+	import { ATJ, parseCliInfo } from "@/utils";
 	import { ElConfirmDanger } from "~/utils/element";
-import { getCurrentWindow } from "@tauri-apps/api/window";
+	import { getCurrentWindow } from "@tauri-apps/api/window";
+	import { isNaN } from "lodash-es";
 	// 	enum NatType {
 	//   // has NAT; but own a single public IP, port is not changed
 	//   Unknown = 0;
@@ -109,7 +140,7 @@ import { getCurrentWindow } from "@tauri-apps/api/window";
 	};
 	type natKyes = keyof typeof natMaps;
 
-	const data = reactive<{ member: any[] }>({
+	const data = reactive<{ member: { hostname: string; cost: string; ipv4: string; lat_msg: string; loss_rate: string; nat_type: string }[] }>({
 		member: []
 	});
 
@@ -121,7 +152,9 @@ import { getCurrentWindow } from "@tauri-apps/api/window";
 		["loss_rate", "丢包率"],
 		["nat_type", "NAT类型"],
 		["version", "版本"],
-		["tunnel_proto", "隧道协议"]
+		["tunnel_proto", "隧道协议"],
+		["rx_bytes", "接收"],
+		["tx_bytes", "传输"]
 	];
 
 	let timer: NodeJS.Timeout | null = null;
@@ -148,7 +181,7 @@ import { getCurrentWindow } from "@tauri-apps/api/window";
 			}
 			return;
 		}
-		const peerInfo = parsePeerInfo(member);
+		const peerInfo = parseCliInfo(member);
 		peerInfo.forEach(value => {
 			if (value.cost === "Local") {
 				value.cost = "本机";
@@ -157,6 +190,7 @@ import { getCurrentWindow } from "@tauri-apps/api/window";
 				value.ipv4 = value.ipv4.split("/")[0];
 			}
 		});
+		// console.log(peerInfo)
 		data.member = peerInfo;
 		startTimer();
 	};
@@ -171,7 +205,7 @@ import { getCurrentWindow } from "@tauri-apps/api/window";
 	const stopTimer = () => {
 		timer && clearTimeout(timer);
 		timer = null;
-	}
+	};
 
 	onMounted(async () => {
 		await listenOutput();

pages/server.vue

@@ -85,6 +85,7 @@
 	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();
@@ -122,7 +123,6 @@
 		await appWindow.emitTo("main", "startStopServer", { args });
 	};
 
-    mainStore.$subscribe(async (...a) => {
+	dataSubscribe();
-		await appWindow.emitTo("main", "config", { serverConfig: { ...mainStore.serverConfig }});
+
-	});
 </script>

pages/tool.vue

@@ -8,7 +8,7 @@
 			<ElTabPane
 				label="联机失败解决办法"
 				name="netcard"
-				class="flex flex-col h-full"
+				class="flex h-full flex-col"
 			>
 				<div>
 					<div>
@@ -23,9 +23,9 @@
 						</ElTooltip>
 					</div>
 					<ElLink
-						class="!text-[15px] mr-[10px]"
+						class="mr-[10px] !text-[15px]"
 						type="info"
-						:underline="false"
+						underline="never"
 						@click="open('https://github.com/dechamps/WinIPBroadcast/releases/tag/winipbroadcast-1.6')"
 					>
 						WinIPBroadcast
@@ -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="never"
+							@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,13 +191,14 @@
 			<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]">
 						<ElButton
 							type="warning"
 							size="small"
+							@click.stop="handleCloseAllFireWall"
 						>
 							一键关闭防火墙
 						</ElButton>
@@ -156,10 +245,17 @@
 					<ElButton
 						size="small"
 						:disabled="data.isPing"
-						@click="handleTestPing"
+						@click="handleTestPing('v4')"
 					>
 						Ping一下
 					</ElButton>
+					<!-- <ElButton
+						size="small"
+						:disabled="data.isPing"
+						@click="handleTestPing('v6')"
+					>
+						Ping一下(v6)
+					</ElButton> -->
 				</div>
 				<div class="mt-[5px] flex-1 overflow-auto">
 					<ElInput
@@ -176,16 +272,19 @@
 </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,
@@ -202,9 +301,25 @@
 			name: "",
 			metric: ""
 		},
-		netcardList: []
+		netcardList: [],
+		guids: [],
+		forceBindStart: false
 	});
 
+
+	const handleCloseAllFireWall = async () => {
+		try {
+				const output = await Command.create("netsh", ["advfirewall", "set", "allprofiles", "state", "off"], {
+					encoding: "gb2312"
+				}).execute();
+				ElMessage.success("关闭成功");
+				await initFirewall();
+			} catch (err) {
+				ElMessage.error(`关闭失败${err}`);
+				console.error(err);
+			}
+	}
+
 	const handleTabsChange = async (tabPaneName: TabPaneName) => {
 		if (tabPaneName === "netcard") {
 			// await initNetCardInfo();
@@ -237,14 +352,15 @@
 		});
 	};
 
-	const handleTestPing = async () => {
+	const handleTestPing = async (type: 'v4' | 'v6' = 'v4') => {
 		// const is = isValidIP(data.pingIp);
 		if (data.pingIp) {
 			data.pingLog = "";
 			data.isPing = true;
+			const args = type === 'v4' ? ["-n", "1", data.pingIp] : ["-6", '-n', "1", data.pingIp]
 			try {
 				for (let i = 0; i < data.pingNum; i++) {
-					const output = await Command.create("ping", ["-n", "1", data.pingIp], {
+					const output = await Command.create("ping", args, {
 						encoding: "gb2312"
 					}).execute();
 					if (output.stdout) {
@@ -253,18 +369,18 @@
 					if (output.stderr) {
 						data.pingLog += `${i + 1}error - ${output.stderr}`;
 					}
-					if(i != data.pingNum - 1) {
+					if (i != data.pingNum - 1) {
 						await awaitTime(1000);
 					}
 				}
-				data.pingLog += '完毕'
+				data.pingLog += "完毕";
 			} catch (err) {
 				ElMessage.error("Ping发生错误");
 				console.error(err);
 			} finally {
 				data.isPing = false;
 			}
-		}else {
+		} else {
 			ElMessage.error("请输入正确的IP");
 		}
 	};
@@ -328,14 +444,66 @@
 		}
 	};
 
-	const appWindow = getCurrentWindow();
+	const handleBrowser = async () => {
-	mainStore.$subscribe((...a) => {
+		const file = await dialogOpen({
-		// console.error("subscribe", a);
+			multiple: false,
-		appWindow.emitTo("main", "config", { winIpBcAutoStart: mainStore.winIpBcAutoStart, config: { ...mainStore.config } });
+			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;
+		}
+	};
+
+	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();
+		dataSubscribe();
 	});
 </script>

src-tauri/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "easytier-game"
-version = "1.2.7"
+version = "1.4.4"
 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,37 +18,44 @@ name = "app_lib"
 crate-type = ["staticlib", "cdylib", "rlib"]
 
 [build-dependencies]
-tauri-build = { version = "2.0.3", features = [] }
+tauri-build = { version = "2.2.0", features = [] }
 # prost-build = "0.13.2"
 
+[target.x86_64-pc-windows-msvc.build-dependencies]
+thunk-rs = { git = "https://github.com/easytier/thunk.git", default-features = false, features = ["win7"] } # 需要安装curl和7zip，并添加他们的路径到环境变量
+
 [dependencies]
-serde_json = "1.0"
+serde_json = "1.0.137"
-serde = { version = "1.0", features = ["derive"] }
+serde = { version = "1.0.217", features = ["derive"] }
-log = "0.4"
+log = "0.4.26"
-tauri = { version = "2.1.1", features = [
+tauri = { version = "2.5.0", features = [ "protocol-asset",
     "tray-icon",
     "image-png",
-    "image-ico",
+    "image-ico"
 ] }
 
-tauri-plugin-log = "2.0.2"
+tauri-plugin-log = "2.3.1"
-tauri-plugin-shell = "2.0.2"
+tauri-plugin-shell = "2.2.1"
-reqwest = { version = "0.12", features = ["json"] }
+reqwest = { version = "0.12.12", features = ["json"] }
-zip = "2.2.0"
+zip = "2.2.3"
-sysinfo = '0.32.0'
+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-fs = "2.2.1"
-tauri-plugin-clipboard-manager = "2.0.2"
+tauri-plugin-clipboard-manager = "2.2.2"
-tokio = { version = "1.41.1", features = ["process"] }
+rand = "0.9.0"
+tokio = { version = "1.43.0", features = ["process"] }
+tauri-plugin-dialog = "2.2.1"
 # prost = "0.13"
 # prost-types = "0.13"
+hashbrown = "0.15.2"
+# futures-util = "0.3"
 
 [dependencies.windows]
 version = "0.58.0"
-features = ["Win32_System_TaskScheduler"]
+features = ["Win32_System_TaskScheduler", "Win32_System_Com", "Win32_System_Power", "Win32_NetworkManagement_IpHelper", "Win32_NetworkManagement_Ndis", "Win32_Networking_WinSock"]
 
 [target."cfg(not(any(target_os = \"android\", target_os = \"ios\")))".dependencies]
-tauri-plugin-autostart = "2.0.1"
+tauri-plugin-cli = "2.2.0"
-tauri-plugin-single-instance = "2.0.1"
+tauri-plugin-single-instance = "2.2.3"
-tauri-plugin-window-state = "2"
+tauri-plugin-window-state = "2.2.2"

src-tauri/build.rs

@@ -1,4 +1,5 @@
 fn main() {
+    thunk::thunk();
     let mut windows = tauri_build::WindowsAttributes::new();
     windows = windows.app_manifest(
         r#"

src-tauri/capabilities/default.json

@@ -1,103 +1,123 @@
 {
-  "$schema": "../gen/schemas/desktop-schema.json",
+	"$schema": "../gen/schemas/desktop-schema.json",
-  "identifier": "default",
+	"identifier": "default",
-  "description": "enables the default permissions",
+	"description": "enables the default permissions",
-  "windows": [
+	"windows": ["main", "log", "member", "cidr", "advance", "tool", "server", "gameList"],
-    "main",
+	"permissions": [
-    "log",
+		"core:default",
-    "member",
+		"core:window:allow-minimize",
-    "cidr",
+		"core:window:allow-unminimize",
-    "advance",
+		"core:window:allow-hide",
-    "tool",
+		"core:window:allow-close",
-    "server"
+		"core:window:allow-set-focus",
-  ],
+		"core:window:allow-is-visible",
-  "permissions": [
+		"shell:allow-open",
-    "core:default",
+		"core:window:allow-show",
-    "core:window:allow-minimize",
+		"core:window:allow-create",
-    "core:window:allow-hide",
+		"core:window:allow-set-position",
-    "core:window:allow-close",
+		"core:window:allow-destroy",
-    "core:window:allow-set-focus",
+		"core:webview:allow-create-webview-window",
-    "core:window:allow-is-visible",
+		"core:webview:allow-set-webview-size",
-    "shell:allow-open",
+		"core:webview:allow-set-webview-position",
-    "core:window:allow-show",
+		"core:webview:allow-create-webview",
-    "core:window:allow-create",
+		"core:webview:allow-webview-show",
-    "core:window:allow-set-position",
+		"core:webview:allow-webview-hide",
-    "core:window:allow-destroy",
+		"core:webview:allow-webview-close",
-    "core:webview:allow-create-webview-window",
+		"core:tray:allow-get-by-id",
-    "core:webview:allow-set-webview-size",
+		"core:tray:allow-set-icon",
-    "core:webview:allow-set-webview-position",
+		"core:tray:allow-new",
-    "core:webview:allow-create-webview",
+		{
-    "core:webview:allow-webview-show",
+			"identifier": "shell:allow-spawn",
-    "core:webview:allow-webview-hide",
+			"allow": [
-    "core:webview:allow-webview-close",
+				{
-    "autostart:default",
+					"args": ["run"],
-    "autostart:allow-enable",
+					"cmd": "$RESOURCE/easytier/tool/WinIPBroadcast",
-    "autostart:allow-disable",
+					"name": "WinIPBroadcast"
-    "autostart:allow-is-enabled",
+				},
-    "core:tray:allow-get-by-id",
+				{
-    "core:tray:allow-set-icon",
+					"args": true,
-    "core:tray:allow-new",
+					"cmd": "$RESOURCE/easytier/tool/ForceBindIP",
-    {
+					"name": "ForceBindIP"
-      "identifier": "shell:allow-spawn",
+				},
-      "allow": [
+				{
-        {
+					"args": true,
-          "args": [
+					"cmd": "$RESOURCE/easytier/tool/ForceBindIP64",
-            "run"
+					"name": "ForceBindIP64"
-          ],
+				}
-          "cmd": "$RESOURCE/easytier/tool/WinIPBroadcast",
+			]
-          "name": "WinIPBroadcast"
+		},
-        }
+		{
-      ]
+			"identifier": "shell:allow-execute",
-    },
+			"allow": [
-    {
+				{
-      "identifier": "shell:allow-execute",
+					"args": ["run"],
-      "allow": [
+					"cmd": "$RESOURCE/easytier/tool/WinIPBroadcast",
-        {
+					"name": "WinIPBroadcast"
-          "args": [
+				},
-            "run"
+				{
-          ],
+					"args": true,
-          "cmd": "$RESOURCE/easytier/tool/WinIPBroadcast",
+					"cmd": "$RESOURCE/easytier/tool/ForceBindIP",
-          "name": "WinIPBroadcast"
+					"name": "ForceBindIP"
-        },
+				},
-        {
+				{
-          "args": true,
+					"args": true,
-          "cmd": "$RESOURCE/easytier/tool/nssm",
+					"cmd": "$RESOURCE/easytier/tool/ForceBindIP64",
-          "name": "nssm"
+					"name": "ForceBindIP64"
-        },
+				},
-        {
+				{
-          "args": true,
+					"args": true,
-          "cmd": "explorer",
+					"cmd": "$RESOURCE/easytier/tool/nssm",
-          "name": "explorer"
+					"name": "nssm"
-        },
+				},
-        {
+				{
-          "args": true,
+					"args": true,
-          "cmd": "netsh",
+					"cmd": "explorer",
-          "name": "netsh"
+					"name": "explorer"
-        },
+				},
-        {
+				{
-          "args": true,
+					"args": true,
-          "cmd": "ping",
+					"cmd": "wf.msc",
-          "name": "ping"
+					"name": "wf.msc"
-        }
+				},
-      ]
+				{
-    },
+					"args": true,
-    "fs:default",
+					"cmd": "netsh",
-    "fs:allow-read-dir",
+					"name": "netsh"
-    "fs:allow-exists",
+				},
-    "fs:allow-open",
+				{
-    "fs:allow-resource-read",
+					"args": true,
-    "fs:allow-resource-read-recursive",
+					"cmd": "ping",
-    "fs:allow-resource-write",
+					"name": "ping"
-    "fs:allow-resource-write-recursive",
+				},
-    "clipboard-manager:allow-clear",
+				{
-    "clipboard-manager:allow-read-text",
+					"args": true,
-    "clipboard-manager:allow-write-text",
+					"cmd": "powershell",
-
+					"name": "powershell"
-    "window-state:default",
+				}
-    "window-state:allow-save-window-state",
+			]
-    "window-state:allow-restore-state",
+		},
-
+		"fs:default",
-    "log:default",
+		{
-    "log:allow-log"
+			"identifier": "fs:allow-read-dir",
-  ]
+			"allow": [{ "path": "$DESKTOP" }, { "path": "$DESKTOP/*" }, { "path": "**/*" }, { "path": "**" }]
-}
+		},
+		"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"
+	]
+}

src-tauri/easytier/config_template.json

@@ -4,23 +4,37 @@
         "tcp",
         "udp"
     ], // 协议类型
-    
     // easytier服务地址 - 可填写多个 方式1，逗号分隔，"xxxx.cn,yyyy.com" 方式2,数组 ["xxxx.cn","yyyy.com"] （默认选中第一个）
-    "serverUrl": "public.easytier.top:11010", 
+    "serverUrl": "public.easytier.top:11010",
-    "networkName": "",  // 网络名
+    "enableCustomListener": true,
-    "networkPassword": "", // 网络密码
+    "customListenerData": [
-    "hostname": "configTest", // 主机名
+        "tcp://0.0.0.0:11010",
-    "ipv4": "10.126.126.1", // IP地址(选填，下面有dhcp)
+        "udp://0.0.0.0:11010",
-    "disableIpv6": false, // 禁用ipv6
+        "tcp://[::]:11010"
-    "disbleListenner": true, // 禁用端口监听
+    ],
+    "networkName": "",  //房间名
+    "networkPassword": "", //房间密码
+    "hostname": "", //主机名
+    "ipv4": "", // 虚拟IP地址
+    "disableIpv6": false,  // 禁用ipv6
+    "enableCustomListenerV6": true, // 启用ipv6监听
+    "customListenerV6Data": "udp://[::]:11010",  // ipv6监听地址
+    "disbleListenner": false, //    禁用监听
     "disableEncryption": false, // 禁用加密
+    "enablExitNode": false, // 启用出口节点
     "noTun": false, // 禁用tun
     "latencyfirst": false, // 延迟优先
-    "disableUdpHolePunching": false, // 禁用udp打洞
+    "disableUdpHolePunching": false,  // 禁用udp打洞
-    "disbleP2p": false,  // 禁用p2p, 强制中转
+    "disbleP2p": false, // 禁用p2p 强制中转
-    "dhcp": false,  // 动态分配IP
+    "dhcp": true, // 启用dhcp,动态获取IP
-    "devName": false, // 是否启用自定义网卡名
+    "devName": true, // 启用自定义网卡名
-    "devNameValue": "", // 网卡名(启用devName之后才生效)
+    "devNameValue": "etgame", // 自定义网卡名
-    "enableNetCardMetric": false,  // 自定义easytier每次生成的网卡跃点
+    "enableCustomProtocol": true, // 自定义p2p时默认协议
-    "netCardMetricValue": 1 // 网卡跃点数量(1-9999)
+    "customProtocol": "tcp", // 自定义p2p时使用的协议类型
+    "enableNetCardMetric": true, // 启用自定义网卡跃点
+    "netCardMetricValue": 1, // 网卡跃点
+    "enablePreventSleep": false, // 启用防止睡眠
+    "compression": "none", // 压缩算法
+    "enableKcpProxy": true, // 启用kcp代理
+    "disableKcpInput": false //     禁用kcp输入
 }

src-tauri/src/lib.rs

@@ -3,26 +3,125 @@ use planif::schedule::TaskScheduler as planIfTaskScheduler;
 use planif::schedule_builder::{Action, ScheduleBuilder};
 use planif::settings::{Duration, LogonType, PrincipalSettings, RunLevel};
 use reqwest::{Client, Error};
+// use futures_util::StreamExt;
 use serde::{Deserialize, Serialize};
 use std::collections::HashMap;
 use std::fs::{self, File};
 use std::io::{BufRead, BufReader, Write};
 use std::os::windows::process::CommandExt;
 use std::process::{Command, Stdio};
+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::rng();
+    let template = user_agents[rng.random_range(0..user_agents.len())];
+
+    // 生成随机版本号
+    let version_major: u8 = rng.random_range(70..90);
+    let version_minor: u8 = rng.random_range(0..10);
+    let version_patch: u8 = rng.random_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)]
 pub struct Release {
@@ -46,20 +145,61 @@ 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列表
     response.json::<Vec<Release>>().await
 }
 
+#[tauri::command(rename_all = "snake_case")]
+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
+    {
+        // 反序列化响应体为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("")]
+            }
+        }
+    } else {
+        log::error!("failed to get game release");
+        [String::from(""), String::from("")]
+    }
+}
+
 #[tauri::command(rename_all = "snake_case")]
 fn get_core_version() -> String {
-    let core_path = get_tool_exe_path(String::from("\\easytier\\easytier-core.exe"));
+    let core_path = get_tool_exe_path("\\easytier\\easytier-core.exe");
     match Command::new(&core_path)
         .arg("--version")
         .creation_flags(0x08000000)
@@ -79,7 +219,7 @@ fn get_core_version() -> String {
 // #[tauri::command(rename_all = "snake_case")]
 // #[warn(dead_code)]
 // fn get_cli_version() -> String {
-//     let cli_path = get_tool_exe_path(String::from("\\easytier\\easytier-cli.exe"));
+//     let cli_path = get_tool_exe_path("\\easytier\\easytier-cli.exe");
 //     match Command::new(&cli_path)
 //         .arg("--version")
 //         .creation_flags(0x08000000)
@@ -93,9 +233,10 @@ fn get_core_version() -> String {
 //     }
 // }
 
-fn get_tool_exe_path(path: String) -> String {
+fn get_tool_exe_path(path: &str) -> String {
     let cur_vec = get_exe_directory();
-    let tool_path = cur_vec[1].to_string() + &path.to_string();
+    let tool_path = format!("{}{}", cur_vec[1].as_str(), path);
+    // log::error!("tool path: {}", tool_path);
     return tool_path;
 }
 
@@ -133,18 +274,19 @@ struct MyResponse {
 
 #[tauri::command(rename_all = "snake_case")]
 async fn get_members_by_cli() -> String {
-    let cli_path = get_tool_exe_path(String::from("\\easytier\\easytier-cli.exe"));
+    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
+        .output()
+        .await
     {
         Ok(output) => {
             if output.status.success() {
                 let output_str = String::from_utf8_lossy(&output.stdout);
                 return output_str.trim().to_string();
-            }else {
+            } else {
                 let output_str = String::from_utf8_lossy(&output.stderr);
                 log::error!("{}", output_str.trim().to_string());
                 return "_EasytierGameCliFailedToConnect_".to_string();
@@ -153,13 +295,39 @@ async fn get_members_by_cli() -> String {
         Err(_e) => {
             log::error!("get member list error");
             return "".to_string();
-        },
+        }
     }
 }
 
 #[tauri::command(rename_all = "snake_case")]
-async fn download_easytier_zip(download_url: String, file_name: String) {
+async fn get_route_by_cli() -> String {
-    let cache_dir_path = get_tool_exe_path(String::from("\\easytier\\cache"));
+    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();
+        }
+    }
+}
+
+#[tauri::command(rename_all = "snake_case")]
+async fn download_easytier_zip(app_handle: tauri::AppHandle ,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() {
@@ -168,12 +336,12 @@ async fn download_easytier_zip(download_url: String, file_name: String) {
     }
 
     let target = format!("{}", download_url);
-    let response = reqwest::get(target)
+    let mut response = reqwest::get(target)
         .await
         .expect("error to download easytier url");
-    let easytier_path = get_tool_exe_path(String::from("\\easytier"));
+    let easytier_path = get_tool_exe_path("\\easytier");
     let file_path = format!("{}\\{}", easytier_path, file_name);
-    println!("download easytier to {}", file_path);
+    // println!("download easytier to {}", file_path);
 
     let easytier_dir = path::Path::new(&easytier_path);
     if !easytier_dir.exists() {
@@ -187,11 +355,20 @@ async fn download_easytier_zip(download_url: String, file_name: String) {
         Err(why) => panic!("couldn't create {}", why),
         Ok(file) => file,
     };
-
+    let context_size: u64 = response.content_length().unwrap();
-    let content = response.bytes().await.expect("error to bytes easytier");
+    while let Some(item) = response.chunk().await.unwrap() {
-    println!("下载完成，开始写入");
+        match file.write_all(&item) {
-    file.write_all(&content).expect("error to write easytier");
+            Ok(_) => {
-    println!("写入完成");
+                app_handle.emit("download_core_progress", [item.len() as u64, context_size]).expect("error to emit download_core_progress");
+            },Err(why) => {
+                log::error!("error to write file: {}", why);
+                app_handle.emit("download_core_progress_error", why.to_string()).expect("error to emit download_core_progress_error");
+                return
+            }
+        };
+        
+    }
+    println!("下载完成");
     unzip(path);
 
     let cache_dir_path = path::Path::new(&cache_dir_path);
@@ -238,7 +415,7 @@ fn unzip(fname: &path::Path) {
         //         fs::create_dir_all(p).unwrap();
         //     }
         // }
-        let easytier_path = get_tool_exe_path(String::from("\\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();
@@ -270,7 +447,7 @@ fn run_command(app_handle: tauri::AppHandle, args: Vec<String>, is_server: Optio
         command_output_str = "server-command-output";
     }
     thread::spawn(move || {
-        let core_path = get_tool_exe_path(String::from("\\easytier\\easytier-core.exe"));
+        let core_path = get_tool_exe_path("\\easytier\\easytier-core.exe");
         // trace, debug, info, warn, error, off
         let mut child = Command::new(&core_path)
             .args(args)
@@ -356,20 +533,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.show();
-            let _ = window.hide();
+        let _ = window.unminimize();
-        } else {
+        let _ = window.set_focus();
-            let _ = window.show();
-            let _ = window.set_focus();
-        }
     }
 }
 
@@ -482,7 +656,7 @@ fn autostart_is_enabled() -> bool {
     }
 }
 
-pub const AUTOSTART_ARG: &str = "--autostart";
+// 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 {
@@ -550,10 +724,12 @@ fn autostart(enabled: bool) -> std::result::Result<(), Box<dyn std::error::Error
 #[cfg_attr(mobile, tauri::mobile_entry_point)]
 pub fn run() {
     // 获取命令行参数
-    let args: Vec<String> = std::env::args().collect();
+    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)
@@ -561,10 +737,6 @@ pub fn run() {
         )
         .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
@@ -574,9 +746,9 @@ pub fn run() {
                 .expect("failed to set focus");
         }))
         .setup(move |app| {
-            let args = args.clone();
+            // let args = args.clone();
             // if cfg!(debug_assertions) {
-            let log_path = get_tool_exe_path(String::from("\\easytier\\guiLogs"));
+            let log_path = get_tool_exe_path("\\easytier\\guiLogs");
             app.handle().plugin(
                 tauri_plugin_log::Builder::default()
                     .target(tauri_plugin_log::Target::new(
@@ -592,7 +764,7 @@ pub fn run() {
             // }
             #[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,
@@ -611,11 +783,11 @@ pub fn run() {
                 .build(app)?;
 
             // 开机自启隐藏到托盘或者显示主窗口
-            if !args.contains(&String::from(TASKAUTOSTART_ARG)) {
+            // if !args.contains(&String::from(TASKAUTOSTART_ARG)) {
-                let main_window = app.get_webview_window("main").unwrap();
+            //     let main_window = app.get_webview_window("main").unwrap();
-                main_window.show().expect("failed to show window");
+            //     main_window.show().expect("failed to show window");
-                main_window.set_focus().expect("failed to set focus");
+            //     main_window.set_focus().expect("failed to set focus");
-            }
+            // }
 
             Ok(())
         })
@@ -624,12 +796,17 @@ pub fn run() {
             stop_command,
             get_core_version,
             fetch_easytier_list,
+            fetch_game_releases,
             download_easytier_zip,
             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");

src-tauri/tauri.conf.json

@@ -1,19 +1,18 @@
 {
 	"$schema": "../node_modules/@tauri-apps/cli/config.schema.json",
 	"productName": "easytier-game",
-	"version": "1.2.7",
+	"version": "1.4.4",
 	"identifier": "com.tauri.easytier-game",
 
 	"build": {
 		"frontendDist": "../dist",
 		"devUrl": "http://localhost:5000",
-		"beforeBuildCommand": "pnpm build",
 		"beforeDevCommand": "pnpm dev"
 	},
 	"app": {
 		"windows": [
 			{
-				"title": "easytier-game 1.2.7",
+				"title": "easytier-game 1.4.4",
 				"label": "main",
 				"minWidth": 340,
 				"width": 340,
@@ -31,10 +30,24 @@
 			}
 		],
 		"security": {
-			"csp": null
+			"csp": null,
+			"assetProtocol": {
+				"enable": true,
+				"scope": ["**"]
+			}
+		}
+	},
+	"plugins": {
+		"cli": {
+			"description": "easytier game CLI Plugin",
+			"args": [
+				{
+					"name": "task-auto-start",
+					"description": "easytier game autostart"
+				}
+			]
 		}
 	},
-	"plugins": {},
 	"bundle": {
 		"active": false,
 		"targets": "all",
@@ -43,13 +56,18 @@
 			"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/clear_local_data.bat",
-			"帮助.txt"
+			"帮助.txt",
+			"uninstall.exe"
 		],
 		"windows": {
 			"webviewInstallMode": {

src-tauri/帮助.txt

@@ -8,12 +8,14 @@
 
 
 [如果想彻底删除easytierGame]
-
+--
 1. 关闭easytierGame
 
 2. 运行easytier-game安装目录下的 easytier/clear_local_data.bat (需要管理员权限) 输入y确认，清除本地存储数据
 
 3. 删除easytierGame文件夹
+--
+或者直接使用uninstall.exe
 
 
 [没有服务器，怎么自建服务]

stores/index.ts

@@ -1,9 +1,9 @@
-import { defineStore } from "pinia";
+import { acceptHMRUpdate, defineStore } from "pinia";
-export default defineStore("main", {
+const store = defineStore("main", {
 	state() {
 		return {
 			config: {
-				protocol: ["tcp", "udp"], // 网络协议
+				protocol: ["tcp"], // 网络协议
 				serverUrl: "public.easytier.top:11010",
 				networkName: "",
 				networkPassword: "",
@@ -13,23 +13,35 @@ export default defineStore("main", {
 				autoStart: false, // 是否自动启动
 				connectAfterStart: false, //软件打开后，是否自动连接
 				disableIpv6: false, // 是否禁用IPv6
+				port: "11010", // 监听端口号
+				enableCustomListener: true, // 是否自定义监听
+				enableCustomListenerV6: true, // 是否自定义IPV6监听
+				customListenerV6Data: "udp://[::]:11010", //自定义ipv6监
+				customListenerData: "tcp://0.0.0.0:11010\nudp://0.0.0.0:11010\ntcp://[::]:11010", // 自定义监听地址
 				disbleListenner: false, // 是否禁用监听
-				disableEncryption: true, // 是否禁用加密
+				disableEncryption: false, // 是否禁用加密
 				multiThread: false, //使用多线程
 				enablExitNode: false, // 是否启用退出节点
 				noTun: false, // 是否使用TUN
 				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, //自定义网卡名
+				devName: true, //自定义网卡名
-				devNameValue: "", //自定义网卡名
+				devNameValue: "etgame", //自定义网卡名
-				enableNetCardMetric: false, //启用网卡自定义跃点
+				enableCustomProtocol: true, //自定义默认协议
-				netCardMetricValue: 1 //自定义网卡跃点值
+				customProtocol: "tcp", //自定义默认协议
+				enableNetCardMetric: true, //启用网卡自定义跃点
+				netCardMetricValue: 1, //自定义网卡跃点值
+				enablePreventSleep: false, //组织系统休眠
+				compression: "none", //加密算法
+				enableKcpProxy: true, //启用kcp代理  默认开启
+				disableKcpInput: false, //禁用kcp输入
+				bindDeviceEnable: false, //是否绑定设备
 			},
 			serverConfig: {
 				enableWhiteList: true, // 是否启用白名单
@@ -37,20 +49,29 @@ export default defineStore("main", {
 				serverWhiteList: "", // 服务器流量转发白名单
 				// enableListener: true, // 是否启用监听
 				autoStart: false, //随软件自启
-				port: "11010", // 服务器端口
+				port: "11010" // 服务器端口
 			},
 			cidrEnable: false,
-			basePeers: ["public.easytier.top:11010"],
+			proxyForwardBySystem: false, // 是否通过系统内核转发子网代理数据包，禁用内置NAT
+			basePeers: ["public.easytier.top:11010", "public.easytier.net:11010"],
 			theme: false, //主题  false light true dark
 			configStartEnable: false, //使用配置文件启动
 			configPath: "", //配置文件路径
 			winIpBcAutoStart: true,
 			createConfigInEasytier: false, //在easytier目录生成config.json文件吗
-			githubFastUrl: "https://ghproxy.cc/",
+			githubFastUrl: "https://ghfast.top/",
 
+			// forceBindIp配置
+			forceBindIpBit: "64",
+			delayInjectDll: false,
+			forceBindInput: "",
+			forceBindFile: "",
 
 			winipBcPid: 0,
-			winipBcStart: false
+			winipBcStart: false,
+			latestTagName: "",
+
+			gameList: [] as Array<{ name: string; exePath: string; id: string; coverImg?: string; showImg: string }> // 游戏列表
 		};
 	},
 	persist: {
@@ -66,7 +87,6 @@ export default defineStore("main", {
 			"config.autoStart",
 			"config.connectAfterStart",
 			"config.disableIpv6",
-			"config.disbleListenner",
 			"config.disableEncryption",
 			"config.multiThread",
 			"config.enablExitNode",
@@ -83,16 +103,33 @@ export default defineStore("main", {
 			"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",
+
+			"config.enableKcpProxy",
+			"config.disableKcpInput",
+
+			"config.bindDeviceEnable",
 
 			"serverConfig.autoStart",
 			// 'serverConfig.enableListener',
-			'serverConfig.enableWhiteList',
+			"serverConfig.enableWhiteList",
-			'serverConfig.relayAllPeerrpc',
+			"serverConfig.relayAllPeerrpc",
-			'serverConfig.serverWhiteList',
+			"serverConfig.serverWhiteList",
-			'serverConfig.port',
+			"serverConfig.port",
-
 
 			"cidrEnable",
+			"proxyForwardBySystem",
 			"basePeers",
 			"theme",
 			"configStartEnable",
@@ -100,8 +137,18 @@ export default defineStore("main", {
 			"winIpBcAutoStart",
 			"createConfigInEasytier",
 			"githubFastUrl",
-		],
+
+			"forceBindIpBit",
+			"delayInjectDll",
+			"forceBindInput",
+			"forceBindFile",
+			"latestTagName",
+			
+			"gameList"
+		]
 		// // 除了这些，其他都要存下来
 		// omit: ["winipBcPid", "winipBcStart"]
 	}
 });
+if (import.meta.hot) import.meta.hot.accept(acceptHMRUpdate(store, import.meta.hot));
+export default store;

tailwind.config.mjs

@@ -1,8 +1,8 @@
 /** @type {import('tailwindcss').Config} */
 /** @type {import('tailwindcss/plugin')} */
-
+import plugin from "tailwindcss/plugin"
-const plugin = require("tailwindcss/plugin");
+// const plugin = require("tailwindcss/plugin");
-module.exports = {
+export default {
 	content: ["./components/**/*.{js,vue,ts}", "./layouts/**/*.vue", "./pages/**/*.vue", "./plugins/**/*.{js,ts}", "./app.vue", "./error.vue"],
 	theme: {
 		extend: {}

typings/index.d.ts

@@ -1,6 +1,10 @@
 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;
+	readonly VITE_GAME_LIST_PATH: string;
 }
 
 interface ImportMeta {

utils/element.ts

@@ -1,10 +1,10 @@
 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,
+	title: string = "提示",
 	opt: Opt = {
 		action: "",
 		confirmButtonText: "确定",
@@ -40,7 +40,7 @@ export const ElConfirmDanger = (
 
 export const ElConfirmSucces = (
 	content: string,
-	title: string,
+	title: string = "提示",
 	opt: Opt = {
 		action: "",
 		confirmButtonText: "确定",
@@ -76,15 +76,16 @@ export const ElConfirmSucces = (
 
 export const ElConfirmPrimary = (
 	content: string,
-	title: string,
+	title: string = "提示",
 	opt: Opt = {
 		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 = [];
@@ -103,6 +104,7 @@ export const ElConfirmPrimary = (
 		ElMessageBox.confirm(message, title, {
 			closeOnClickModal: false, // 点击遮罩层不关闭弹窗
 			closeOnPressEscape: false, // 按下Esc键不关闭弹窗
+			showCancelButton,
 			cancelButtonText,
 			confirmButtonText,
 			confirmButtonClass: "el-button--primary"

utils/index.ts

@@ -1,4 +1,7 @@
+import { invoke } from "@tauri-apps/api/core";
+import { writeText } from "@tauri-apps/plugin-clipboard-manager";
 import { open } from "@tauri-apps/plugin-shell";
+import { ElMessage } from "element-plus";
 export const ENV = import.meta.env;
 
 //防抖
@@ -50,8 +53,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])
+		.then(data => [null, data])
-		.catch((err) => {
+		.catch(err => {
 			if (errorExt) {
 				if (typeof errorExt !== "object") {
 					return [errorExt, undefined];
@@ -64,8 +67,30 @@ export const ATJ = (promise: Promise<any>, errorExt: string | undefined = undefi
 		});
 };
 
-export const parsePeerInfo = (content: string) => {
+const _supportProtocols = ["tcp", "udp", "ws", "wss", "quic"];
-	if(!content) return [];
+
+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");
 
@@ -73,7 +98,7 @@ export const parsePeerInfo = (content: string) => {
 	const headers = lines[1]
 		.split("│")
 		.slice(1, -1)
-		.map((h) => h.trim());
+		.map(h => h.trim());
 
 	// 初始化结果数组
 	const result: any[] = [];
@@ -86,7 +111,7 @@ export const parsePeerInfo = (content: string) => {
 		const values = lines[i]
 			.split("│")
 			.slice(1, -1)
-			.map((v) => v.trim());
+			.map(v => v.trim());
 
 		// 创建对象并添加到结果数组
 		const obj: any = {};
@@ -101,6 +126,20 @@ export const parsePeerInfo = (content: string) => {
 	return result;
 };
 
+export function isValidWindowsFileName(name: string) {
+	if(name.length > 255) return false;
+	const reserved_names = [
+        "CON", "PRN", "AUX", "NUL",
+        "COM1", "COM2", "COM3", "COM4", "COM5", "COM6", "COM7", "COM8", "COM9",
+        "LPT1", "LPT2", "LPT3", "LPT4", "LPT5", "LPT6", "LPT7", "LPT8", "LPT9"
+	];
+	if(reserved_names.includes(name.toUpperCase())) {
+		return false;
+	}
+	return /^[^<>:"/\\|?*\x00-\x1F]+[^<>:"/\\|?*\x00-\x1F .]$/g.test(name);
+	
+}
+
 export const addQQGroup = () => {
 	open("https://qm.qq.com/q/Yo3HmaEIWC");
 };
@@ -111,3 +150,14 @@ export function isValidIP(ip: string) {
 	const ipv6Pattern = /^(?:[A-Fa-f0-9]{1,4}:){7}[A-Fa-f0-9]{1,4}$/;
 	return ipv4Pattern.test(ip) || ipv6Pattern.test(ip);
 }
+
+export const copyText = async (text: string, message: string = "复制成功") => {
+	const [err, _] = await ATJ(writeText(text));
+
+	if (!err) {
+		ElMessage.success(message);
+	} else {
+		console.error(err);
+		ElMessage.success("复制失败");
+	}
+};

utils/service.ts

@@ -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);
-};

zip.js

@@ -1,14 +1,15 @@
 /**
  * 生成 release 发布包 zip 文件
  */
-
+const pkg = require("./package.json");
-const releaseDir = "./src-tauri/target/release";
+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 pkg = require("./package.json");
-const fileName = `easytier-game_windows_x86_64_${pkg.version}.zip`; // 发布包格式
 const releaseZipDir = "./release";
 const releaseZip = `${releaseZipDir}/${fileName}`;
 
@@ -62,5 +63,6 @@ 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();