增加版本号权重校验，发布1.4.2

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

.gitignore

@@ -10,7 +10,7 @@ dist
 .idea
 .vscode
 release
-src-tauri/easytier-cli.exe
+
-src-tauri/easytier-core.exe
+src-tauri/easytier/logs
-src-tauri/Packet.dll
+src-tauri/easytier/tool/ResourcesExtract.exe
-src-tauri/wintun.dll
+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

@@ -1,10 +1,85 @@
-# EasyiterGame
+# [EasyTier游戏联机启动器](https://github.com/EasyTier/EasytierGame)
-基于easytier的简易游戏联机客户端
 
-1. 开发环境如何运行
+## 简介
-   拉取仓库，使用命令行  pnpm install  安装包
+
-   安装完成后， 使用 pnpm tauri dev 进行rust编译 等待启动
+EasyTierGame游戏联机启动器，由`nuxt3` `typescript` `rust` `tauri` 开发
+具有简易的界面，附带最新版easytier内核，联机游玩的时候无论是心理上和使用上都能给予您最舒服的体验，同时支持自定义配置文件启动，满足各种需求
+
+## 下载
+
+Github
+Releases： [https://github.com/EasyTier/EasytierGame/releases](https://github.com/EasyTier/EasytierGame/releases)
+
+- 只有绿色zip包，个人不喜欢安装包各种写注册表，解压即用就行，目录清爽干净
+
+![game-step1](/assets/game-step1.png)
+
+
+## 使用教程
+
+- 第一次使用，输入一个“主机名”点击启动联机即可，后续可以自建服务器或者使用爱心群友提供的服务器
+    ![game-step2](/assets/game-step2.png)
+
+![game-step3](/assets/game-step3.png)
+
+- 高级选项里有一些特殊配置，可以自行选择
+    ![game-step4](/assets/game-step4.png)
+
+- 如果还是无法满足您的需求，可以使用配置文件进行启动，具体如何配置，可以查看文档[配置文件](/guide/network/config-file.html)
+    ![game-step5](/assets/game-step5.png)
+
+- easytier内核升级后，可以点击内核管理按钮就可以进行内核切换和更新，但是需要出国或者github加速链接，如果无法更新，可以在群里获取
+- 1.2.6内核管理下载的内核 保存于easytier/cache目录，下次切换不用二次下载
+    ![game-step6](/assets/game-step6.png)
+
+- 1.1.4更新了 配置分享功能 可以与朋友之间分享配置，方便联机
+
+
+![game-step7](/assets/game-step7.png)
+
+- 1.1.5 合并额外插件于 "增强工具" 窗口 新增了网卡跃点设置 关闭防火墙功能 ping功能
+![game-step8](/assets/game-step8.png)
+
+![game-step9](/assets/game-step9.png)
+
+- 1.1.8 新增了 生成 easytier/config.json 的功能 会将一部分配置写入到 config.json 文件中，方便用户自定义配置，你可以在高级设置里启用和关闭这个功能(默认关闭)
+**需要注意的是，如果config.json存在，每次启动easytierGame默认按照config.json的配置为准**
+**解压zip后你可以查看 easytier/config_template.json 里的注释进行配置**
+![game-step10](/assets/game-step10.png)
+
+- 1.2.3新增了帮助.txt 位于“easytier/帮助.txt" 内含 无法打开界面和卸载EasytierGame的办法，新增 "easytier/clear_local_data.bat" 用于清除easytierGame的本地缓存数据（需要管理员模式运行）
+![game-step11](/assets/game-step11.png)
+
+- 1.2.5新增 自建服务器功能，可以自行搭建服务器，但是需要一些网络知识，具体可以查看文档[自建服务器](https://www.easytier.top/guide/network/host-public-server.html)
+![game-step12](/assets/game-step12.png)
+
+- 1.2.6重写 自建服务器功能，可以自行搭建服务器，但是需要一些网络知识，具体可以查看文档[自建服务器](https://www.easytier.top/guide/network/host-public-server.html),也可查看帮助.txt
+![game-step13](/assets/game-step13.png)
+
+- 1.3.5 增强工具 新增了forceBindIP
+![game-step14](/assets/game-step14.png)
+
+## 特性
+
+- 基于easytier组网工具开发，界面清晰简单
+- 自带“更新”按钮，在easytier组网工具发布新版本时，点击更新即可（需要出国工具）
+- 第一次使用，输入一个“主机名”点击启动联机即可，后续可以自建服务器或者使用群友的服务器
+- 配置简单，也含有高级功能，同时也支持自定义配置文件启动
+- 默认开启 **WinIPBroadcast** 不再怕联机找不到房间（例如：无主之地3）
+- 已经测试 **艾尔登法环学习版**，**无主之地3**，**深岩银河**，**怪物猎人世界** 等都可稳定联机游玩
+
+## 系统支持
+
+支持Windows 11 、Windows 10 、 Windows 7
+
+## 群聊交流
+- 主群 EasyTier 支持 
+### 949700262
+
+- EasyTier游戏联机交流群
+### 596667137
+
+
+
+## 请不要将本程序和仓库代码用于任何违法用途，由此产生的一切后果，仓库所有者和参与开发的人员不承担任何责任
 
-2. 生产环境发布
-   执行 pnpm tauri build
-   产物位于 src-tauri/target/release 下 easytier-game.exe

app.vue

@@ -4,4 +4,33 @@
 	</NuxtLayout>
 </template>
 <script setup lang="ts">
+	import useMainStore from "@/stores/index";
+	import { initTheme } from "@/composables/theme";
+	import { warn, debug, trace, info, error } from "@tauri-apps/plugin-log";
+	function forwardConsole(fnName: "log" | "debug" | "info" | "warn" | "error", logger: (message: string) => Promise<void>) {
+		const original = console[fnName];
+		console[fnName] = message => {
+			original(message);
+			try {
+				if (typeof message === "string") {
+					logger(message);
+				} else {
+					logger(JSON.stringify(message));
+				}
+			} catch (e) {
+				logger(`${message}`);
+			}
+		};
+	}
+	if (import.meta.env.PROD) {
+		forwardConsole("log", info);
+		forwardConsole("debug", debug);
+		forwardConsole("info", info);
+		forwardConsole("warn", warn);
+		forwardConsole("error", error);
+	}
+
+	const mainStore = useMainStore();
+	// console.log(mainStore.theme)
+	initTheme(mainStore.theme);
 </script>

assets/css/main.css

@@ -1,15 +1,17 @@
-@tailwind base;
+/* @tailwind base; */
 
 /*
 	用于进行主题更换，如果要更换elemenet-plus-ui的主题记得加上!important，不然更换会失败
 */
 
-@layer base {
+/* @layer base {
 	html {
 		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%;
@@ -19,11 +21,54 @@ body {
 * {
 	outline: none;
 }
+body {
+	background-color: #fff;
+}
+html.dark body {
+	background-color: #000;
+}
 
 #__easytier {
+	display: flex;
+	flex-direction: column;
+	flex-wrap: nowrap;
 	height: 100%;
 	overflow: hidden;
-	background-color: #fff;
 	box-sizing: border-box;
 	padding: 3px 5px;
 }
+
+.full-label .el-form-item__label {
+	width: 100%;
+	padding-right: 0;
+}
+
+.full-content .el-form-item__content {
+	/* height: 100%; */
+	align-items: flex-start;
+	overflow: auto;
+	flex: 1;
+}
+
+.el-table {
+	font-size: 12px !important;
+}
+
+.el-select-dropdown__wrap {
+	max-height: 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
+rustup default nightly
+rem 使用rust nightly构建支持win7的版本，请先将根目录的windows.0.48.5 放入以下目录
+rem C:\Program Files\Microsoft Visual Studio\2022\Community\VC\Tools\MSVC\你自己的版本\lib\x64
+rem C:\Program Files\Microsoft Visual Studio\2022\Community\VC\Tools\MSVC\你自己的版本\lib\x86
+rem C:\Program Files\Microsoft Visual Studio\2022\Community\VC\Tools\MSVC\你自己的版本\atlmfc\lib\x64
+rem C:\Program Files\Microsoft Visual Studio\2022\Community\VC\Tools\MSVC\你自己的版本\atlmfc\lib\x86
+pnpm tauri build -- -Z  build-std --target x86_64-win7-windows-msvc
+rustup default stable
+pnpm tauri build
+pnpm run release
+pnpm run release-win7

components/CoreVersionWarning.vue

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

composables/configJson.ts

@@ -0,0 +1,47 @@
+import { BaseDirectory, writeTextFile } from "@tauri-apps/plugin-fs";
+import useMainStore from "@/stores/index";
+import { ElMessage } from "element-plus";
+import { uniq, intersection, isNil } from "lodash-es";
+export const updateConfigJson = async (configJsonSeverUrl: Array<string> | string | null | undefined) => {
+	const mainStore = useMainStore();
+	const path = import.meta.env.VITE_CONFIG_FILE_NAME;
+	if (isNil(configJsonSeverUrl)) {
+		configJsonSeverUrl = [];
+	}
+	const isArray = Array.isArray(configJsonSeverUrl);
+	const isString = typeof configJsonSeverUrl === "string";
+	try {
+		const {
+			proxyNetworks,
+			autoStart,
+			connectAfterStart,
+			saveErrorLog,
+			serverUrl,
+			enableCustomListener,
+			customListenerData,
+			...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),
+				mainStore.basePeers
+			);
+		}
+		if (isString && configJsonSeverUrl) {
+			writeServerUrl = intersection(
+				uniq([serverUrl, ...(configJsonSeverUrl as string).split(",")]).filter(boolean => boolean),
+				mainStore.basePeers
+			).join(",");
+		}
+		await writeTextFile(
+			path,
+			JSON.stringify({ serverUrl: writeServerUrl, 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/log.ts

@@ -1,8 +0,0 @@
-// const infoDialog = new WebviewWindow("log", {
-//     title: "日志",
-//     resizable: false,
-//     width: 600,
-//     height: 400,
-//     parent: appWindow,
-//     url: "/log"
-// });

composables/netcard.ts

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

composables/server.ts

@@ -0,0 +1,24 @@
+import useMainStore from "@/stores/index";
+export const getServerArgs = () => {
+	const mainStore = useMainStore();
+	const args = [];
+	if (!mainStore.serverConfig.port) {
+		mainStore.serverConfig.port = "11010";
+	}
+	args.push("-l", mainStore.serverConfig.port);
+	if (mainStore.serverConfig.relayAllPeerrpc) {
+		args.push("--relay-all-peer-rpc");
+	}
+	const whiteList = mainStore.serverConfig.serverWhiteList
+		.trim()
+		.split("\n")
+		.map(el => el.trim())
+		.filter(el => el)
+	if (whiteList && mainStore.serverConfig.enableWhiteList) {
+		args.push("--relay-network-whitelist", ...whiteList);
+	}
+	if (!whiteList && mainStore.serverConfig.enableWhiteList) {
+		args.push("--relay-network-whitelist");
+	}
+	return args;
+};

composables/theme.ts

@@ -0,0 +1,21 @@
+import { useDark, useToggle, usePreferredDark } from "@vueuse/core";
+import { isFunction } from "lodash-es";
+// const isDark = usePreferredDark();
+const darkConfig = useDark({
+	selector: "html",
+	attribute: "class",
+	valueDark: "dark",
+	valueLight: "",
+});
+const toggleDark = useToggle(darkConfig);
+export const initTheme = (isDark: boolean) => {
+	if (isDark && isFunction(toggleDark)) {
+		toggleDark(isDark);
+	}
+};
+
+export const setTheme = (dark: boolean) => {
+    if (isFunction(toggleDark)) {
+		toggleDark(dark);
+	}
+}

composables/tray.ts

@@ -2,6 +2,13 @@ import { Menu, MenuItem, PredefinedMenuItem } from "@tauri-apps/api/menu";
 import { TrayIcon } from "@tauri-apps/api/tray";
 import { getCurrentWindow } from "@tauri-apps/api/window";
 import pkg from "@/package.json";
+import { setTheme } from "~/composables/theme";
+import useMainStore from "@/stores/index";
+import { resourceDir as getResourceDir, join } from "@tauri-apps/api/path";
+import { invoke } from "@tauri-apps/api/core";
+// import { ElConfirmPrimary } from "~/utils/element";
+import { open } from "@tauri-apps/plugin-shell";
+import { computed } from "vue";
 
 const DEFAULT_TRAY_NAME = "main";
 
@@ -10,49 +17,50 @@ async function toggleVisibility() {
 		await getCurrentWindow().hide();
 	} else {
 		await getCurrentWindow().show();
+		await getCurrentWindow().unminimize();
 		await getCurrentWindow().setFocus();
 	}
 }
 
-export async function useTray(init: boolean = false, beforExit: Function) {
+export async function useTray(init: boolean = false, beforExit: Function, handleConnection: Function) {
 	let tray;
 	try {
 		tray = await TrayIcon.getById(DEFAULT_TRAY_NAME);
 		if (!tray) {
 			tray = await TrayIcon.new({
-				tooltip: `EasyTier\n${pkg.version}`,
+				tooltip: `EasyTierGame\n${pkg.version}`,
-				title: `EasyTier\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",
-					items: await generateMenuItem(beforExit)
-				}),
 				action: async e => {
 					toggleVisibility();
 				}
 			});
 		}
 	} catch (error) {
-		console.warn("Error while creating tray icon:", error);
+		console.error("Error while creating tray icon:", error);
 		return null;
 	}
 
 	if (init) {
-		tray.setTooltip(`EasyTier\n${pkg.version}`);
+		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)
-			})
-		);
 	}
 
 	return tray;
 }
 
-export async function generateMenuItem(beforExit: Function) {
+export async function generateMenuItem(beforExit: Function, handleConnection: Function) {
-	return [await MenuItemExit("退出", beforExit), await PredefinedMenuItem.new({ item: "Separator" }), await MenuItemShow("显示 / 隐藏")];
+	return [
+		await MenuItemShow("显示 / 隐藏"),
+		await MenuItemExchangeConnection("联机 / 断开", handleConnection),
+		await MenuItemTheme(),
+		await PredefinedMenuItem.new({ item: "Separator" }),
+		await MenuItemPublicPeers(),
+		await PredefinedMenuItem.new({ item: "Separator" }),
+		await MenuItemExit("退出", beforExit)
+	];
 }
 
 export async function MenuItemExit(text: string, beforExit: Function) {
@@ -68,6 +76,16 @@ export async function MenuItemExit(text: string, beforExit: Function) {
 	});
 }
 
+export async function MenuItemPublicPeers() {
+	return await MenuItem.new({
+		id: "publicPeers",
+		text: "公共节点",
+		action: async () => {
+			await open(import.meta.env.VITE_PUBLIC_PEERS_URL);
+		}
+	});
+}
+
 export async function MenuItemShow(text: string) {
 	return await MenuItem.new({
 		id: "show",
@@ -78,6 +96,30 @@ export async function MenuItemShow(text: string) {
 	});
 }
 
+export async function MenuItemExchangeConnection(text: string, handleConnection: Function) {
+	const menutItem = await MenuItem.new({
+		id: "exchangeConnection",
+		text,
+		action: async () => {
+			const isStart = await handleConnection();
+		}
+	});
+	return menutItem;
+}
+
+export async function MenuItemTheme() {
+	return await MenuItem.new({
+		id: "theme",
+		text: "主题切换",
+		action: async () => {
+			const mainStore = useMainStore();
+			mainStore.$patch({ theme: !mainStore.theme });
+			// mainStore.$persist();
+			await setTheme(mainStore.theme);
+		}
+	});
+}
+
 // export async function setTrayMenu(items: (MenuItem | PredefinedMenuItem)[] | undefined = undefined) {
 //   // const tray = await useTray()
 //   const tray = await TrayIcon.getById(DEFAULT_TRAY_NAME)
@@ -92,15 +134,42 @@ export async function MenuItemShow(text: string) {
 
 export async function setTrayRunState(tray: TrayIcon | null, isRunning: boolean = false) {
 	if (!tray) return;
-	tray.setIcon(isRunning ? "icons/icon-inactive.ico" : "icons/icon.ico");
+	const resourceDir = await getResourceDir();
+	const path = await join(resourceDir, isRunning ? "easytier/icons/icon-inactive.ico" : "easytier/icons/icon.ico");
+	// "easytier/icons/icon-inactive.ico", { baseDir: BaseDirectory.Resource }
+	await tray.setIcon(path);
 }
 
-// export async function setTrayTooltip(tooltip: string) {
+export async function setTrayTooltip(tray: TrayIcon | null, tooltip?: string | null) {
-//   if (tooltip) {
+	if (!tray) return;
-//     const tray = await useTray()
+	if (tooltip) {
-//     if (!tray)
+		await tray.setTooltip(`EasyTierGame\n${pkg.version}\n${tooltip}`);
-//       return
+	} else {
-//     tray.setTooltip(`EasyTier\n${pkg.version}\n${tooltip}`)
+		await tray.setTooltip(`EasyTierGame\n${pkg.version}`);
-//     tray.setTitle(`EasyTier\n${pkg.version}\n${tooltip}`)
+	}
-//   }
+}
-// }
+
+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

@@ -1,48 +1,60 @@
 import { type UnlistenFn } from "@tauri-apps/api/event";
-import { getCurrentWindow, PhysicalPosition, type WindowOptions, Window } from "@tauri-apps/api/window";
+import { getCurrentWindow, PhysicalPosition, type WindowOptions, Window, currentMonitor } from "@tauri-apps/api/window";
 import { WebviewWindow } from "@tauri-apps/api/webviewWindow";
-import type { WebviewLabel, WebviewOptions, } from "@tauri-apps/api/webview";
+import type { WebviewLabel, WebviewOptions } from "@tauri-apps/api/webview";
+import useMainStore from "@/stores/index";
+import { onBeforeUnmount } from "vue";
+
+const _listenersMaps: { [key: string]: [UnlistenFn | null, UnlistenFn | null] } = {};
+
 export default async (
 	label: WebviewLabel,
 	options?: Omit<WebviewOptions, "x" | "y" | "width" | "height"> & WindowOptions,
 	afterCreatedFunc?: (webviewWindow: WebviewWindow, appWindow: Window) => void | null,
 	beforeCloseFunc?: () => void | null
 ) => {
-    let defaultOpts = {
+	const unlistenFnList: [UnlistenFn | null, UnlistenFn | null] = _listenersMaps[label] || [null, null];
-		parent: undefined,
+	let [unlistenLogCreated, unListenlogClose] = unlistenFnList;
-		closable: true,
-		resizable: true,
-		decorations: true,
-		maximizable: false,
-		minimizable: false,
-        x: 0,
-        y: 0
-	};
-	const appWindow = getCurrentWindow();
-	if (appWindow) {
-		const appSize = await appWindow.outerSize();
-		const factor = await appWindow.scaleFactor();
-		const appPosition = await appWindow.outerPosition();
-		const logicalPosition = new PhysicalPosition(appPosition.x + appSize.width, appPosition.y).toLogical(factor);
-        defaultOpts.parent = appWindow as any;
-        defaultOpts.x = logicalPosition.x;
-        defaultOpts.y = logicalPosition.y;
-	}
-	let unListenlogClose: UnlistenFn | null = null;
-	let unlistenLogCreated: UnlistenFn | null = null;
 	let dialog = await WebviewWindow.getByLabel(label);
 	if (!dialog) {
-		dialog = new WebviewWindow(label, {...defaultOpts, ...options});
+		let defaultOpts: { [key: string]: any; parent: Window | undefined } = {
-		unlistenLogCreated = await dialog.once("tauri://webview-created", async () => {
+			parent: undefined,
+			closable: true,
+			resizable: true,
+			decorations: true,
+			maximizable: false,
+			minimizable: false,
+			x: 0,
+			y: 0
+		};
+		const appWindow = getCurrentWindow();
+		if (appWindow) {
+			const appSize = await appWindow.outerSize();
+			const factor = await appWindow.scaleFactor();
+			const appPosition = await appWindow.outerPosition();
+			const logicalPosition = new PhysicalPosition(appPosition.x + appSize.width, appPosition.y).toLogical(factor);
+			defaultOpts.parent = appWindow;
+			// console.error(logicalPosition);
+			defaultOpts.x = logicalPosition.x;
+			defaultOpts.y = logicalPosition.y;
+		}
+		unlistenLogCreated && (await (unlistenLogCreated as Function)());
+		unListenlogClose && (await unListenlogClose());
+		dialog = new WebviewWindow(label, { ...defaultOpts, ...options });
+		unlistenLogCreated = await dialog.listen("tauri://webview-created", async () => {
 			if (dialog) {
 				afterCreatedFunc && (await afterCreatedFunc(dialog, appWindow));
 				await dialog.show();
 			}
 		});
+		unlistenFnList[0] = unlistenLogCreated;
 		unListenlogClose = await dialog.onCloseRequested(async () => {
 			beforeCloseFunc && (await beforeCloseFunc());
 			unListenlogClose && (await unListenlogClose());
+			unlistenLogCreated && (await (unlistenLogCreated as Function)());
 		});
+		unlistenFnList[1] = unlistenLogCreated;
+		_listenersMaps[label] = unlistenFnList;
 	} else {
 		const visible = await dialog.isVisible();
 		if (visible) {
@@ -51,3 +63,20 @@ export default async (
 		}
 	}
 };
+
+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

@@ -0,0 +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

@@ -0,0 +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,6 +5,9 @@
 <script setup lang="tsx">
 	//屏蔽右键菜单
 	document.addEventListener("contextmenu", (e: MouseEvent) => {
-		// e.preventDefault();
+		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();
+		}
 	});
 </script>

nuxt.config.ts

@@ -1,16 +1,7 @@
 import { defineNuxtConfig } from "nuxt/config";
-import fs from "fs";
 import path from "path";
 import vueJSX from "@vitejs/plugin-vue-jsx";
-const isDev = process?.argv?.[2] == "_dev" || process?.argv?.[2] == "dev";
+
-const optimizeDepsElementPlusIncludes = ["element-plus/es"];
-fs.readdirSync("node_modules/element-plus/es/components").map(dirname => {
-	fs.access(`node_modules/element-plus/es/components/${dirname}/style/css.mjs`, err => {
-		if (!err) {
-			optimizeDepsElementPlusIncludes.push(`element-plus/es/components/${dirname}/style/css`);
-		}
-	});
-});
 export default defineNuxtConfig({
 	ssr: false,
 
@@ -18,12 +9,25 @@ export default defineNuxtConfig({
 		port: 5000
 	},
 
+	telemetry: false,
+
 	imports: {
 		autoImport: false
 	},
 
-	css: ["~/assets/css/main.css"],
+	css: ["~/assets/css/main.css", "element-plus/theme-chalk/dark/css-vars.css"],
-	modules: ["@element-plus/nuxt", "@pinia/nuxt", "@pinia-plugin-persistedstate/nuxt", "@nuxtjs/tailwindcss"],
+	modules: [
+		"@element-plus/nuxt",
+		"@pinia/nuxt",
+		[
+			"pinia-plugin-persistedstate/nuxt",
+			{
+				key: "__glj_persisted_%id",
+				storage: "localStorage"
+			}
+		],
+		"@nuxtjs/tailwindcss"
+	],
 
 	alias: {
 		"@": path.resolve(__dirname, "./")
@@ -44,12 +48,10 @@ export default defineNuxtConfig({
 	},
 
 	vite: {
-		plugins: [
+		plugins: [vueJSX({})],
-			vueJSX({}),
-		],
 		envDir: "env",
 		optimizeDeps: {
-			include: [...optimizeDepsElementPlusIncludes]
+			// include: [...optimizeDepsElementPlusIncludes]
 		},
 		// prevent vite from obscuring rust errors
 		clearScreen: false,
@@ -84,7 +86,7 @@ export default defineNuxtConfig({
 
 	app: {
 		rootId: "__easytier",
-		cdnURL: "./", 
+		cdnURL: "./",
 		buildAssetsDir: "__easytier/",
 		head: {
 			meta: [
@@ -102,5 +104,6 @@ export default defineNuxtConfig({
 			// script: [],
 			// noscript: []
 		}
-	}
+	},
+	compatibilityDate: "2024-11-12"
 });

package.json

@@ -3,41 +3,39 @@
 	"private": true,
 	"author": "leizi97",
 	"description": "A simple network initiator based on Easytier",
-	"version": "1.0.7",
+	"version": "1.4.2",
 	"scripts": {
 		"dev": "nuxt dev --dotenv env/.env.dev --host 0.0.0.0",
-		"build": "nuxt generate --dotenv env/.env.prod"
+		"build": "nuxt generate --dotenv env/.env.prod",
+		"release": "node zip.js",
+		"release-win7": "node zip.js win7"
 	},
 	"devDependencies": {
 		"@element-plus/icons-vue": "^2.3.1",
-		"@element-plus/nuxt": "^1.0.9",
+		"@element-plus/nuxt": "^1.1.1",
-		"@nuxtjs/tailwindcss": "^6.12.0",
+		"@nuxtjs/tailwindcss": "6.13.1",
-		"@pinia-plugin-persistedstate/nuxt": "^1.2.0",
+		"@pinia/nuxt": "0.10.1",
-		"@pinia/nuxt": "^0.5.1",
+		"@tauri-apps/api": "2.3.0",
-		"@tauri-apps/api": "^2.0.2",
+		"@tauri-apps/cli": "2.3.0",
-		"@tauri-apps/cli": "^2.0.2",
+		"@tauri-apps/plugin-cli": "^2.2.0",
-		"@tauri-apps/plugin-cli": "^2.0.0",
+		"@tauri-apps/plugin-clipboard-manager": "2.2.1",
-		"@tauri-apps/plugin-http": "^2.0.0",
+		"@tauri-apps/plugin-dialog": "2.2.0",
-		"@tauri-apps/plugin-shell": "~2",
+		"@tauri-apps/plugin-fs": "^2.2.0",
-		"@tinymce/tinymce-vue": "^5.1.1",
+		"@tauri-apps/plugin-log": "2.2.2",
+		"@tauri-apps/plugin-shell": "^2.2.0",
+		"@tauri-apps/plugin-window-state": "2.2.1",
 		"@types/lodash-es": "^4.17.12",
-		"@types/qs": "^6.9.15",
+		"@vitejs/plugin-vue-jsx": "^4.1.1",
-		"@vitejs/plugin-vue-jsx": "^3.1.0",
+		"@vueuse/core": "12.7.0",
-		"dayjs": "^1.11.10",
+		"archiver": "^7.0.1",
-		"defu": "^6.1.4",
+		"element-plus": "2.9.4",
-		"element-plus": "^2.8.6",
+		"less": "4.2.1",
-		"less": "^4.2.0",
 		"lodash-es": "^4.17.21",
-		"nuxt": "^3.11.2",
+		"nuxt": "3.15.4",
-		"pinia": "^2.1.7",
+		"pinia": "3.0.1",
+		"pinia-plugin-persistedstate": "^4.2.0",
 		"postcss": "^8.4.38",
-		"qs": "^6.12.0",
+		"prettier": "3.5.2",
-		"typescript": "^5.4.5",
+		"prettier-plugin-tailwindcss": "0.6.11"
-		"vue": "^3.4.24",
-		"vue-clipboard3": "^2.0.0",
-		"xlsx": "^0.18.5"
-	},
-	"dependencies": {
-		"@tauri-apps/plugin-autostart": "~2"
 	}
 }

pages/advance.vue

@@ -1,28 +1,326 @@
 <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>
+		<div class="flex flex-nowrap items-center gap-[15px]">
-			<ElCheckbox v-model="mainStore.config.disableIpv6">不使用IPv6</ElCheckbox>
+			<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.disbleListenner">不监听任何端口，只连接到对等节点</ElCheckbox></div>
-		<div><ElCheckbox v-model="mainStore.config.enablExitNode">允许此节点成为出口节点</ElCheckbox></div>
-		<div><ElCheckbox v-model="mainStore.config.disableEncryption">禁用对等节点通信的加密，默认为false，必须与对等节点相同</ElCheckbox></div>
-		<div><ElCheckbox v-model="mainStore.config.multiThread">使用多线程运行时，默认为单线程</ElCheckbox></div>
-		<div><ElCheckbox v-model="mainStore.config.noTun">不创建TUN设备，可以使用子网代理访问节点</ElCheckbox></div>
-		<div><ElCheckbox v-model="mainStore.config.useSmoltcp">为子网代理启用smoltcp堆栈</ElCheckbox></div>
-		<div><ElCheckbox v-model="mainStore.config.latencyfirst">延迟优先模式，将尝试使用最低延迟路径转发流量，默认使用最短路径</ElCheckbox></div>
-		<div><ElCheckbox v-model="mainStore.config.disableUdpHolePunching">禁用UDP打洞功能</ElCheckbox></div>
 		<div>
-			<ElCheckbox v-model="mainStore.config.relayAllPeerrpc">转发所有对等节点的RPC数据包，即使对等节点不在转发网络白名</ElCheckbox>
+			<ElCheckbox v-model="mainStore.config.relayAllPeerrpc">帮助对等节点建立直连(p2p)通信</ElCheckbox>
+		</div>
+		<div><ElCheckbox v-model="mainStore.config.connectAfterStart">软件启动后，自动"启动联机"(搭配开机自启，无感联机)</ElCheckbox></div>
+		<div class="flex flex-nowrap items-center gap-[15px]">
+			<ElCheckbox v-model="mainStore.createConfigInEasytier">自动生成界面配置文件easytier/config.json</ElCheckbox>
+			<ElButton
+				@click="openConfigJsonDir"
+				size="small"
+			>
+				打开config.json目录
+			</ElButton>
+		</div>
+		<div><ElCheckbox v-model="mainStore.config.enablePreventSleep">防止系统休眠(比如:屏幕会一直亮着)</ElCheckbox></div>
+		<div class="flex flex-nowrap items-center gap-[5px]">
+			<ElCheckbox v-model="mainStore.config.latencyfirst">延迟优先模式，将尝试使用最低延迟路径转发流量</ElCheckbox>
+			<ElTooltip content="视网络质量进行选择，可能会出现中转与直连(p2p)来回切换的情况">
+				<ElIcon><QuestionFilled /></ElIcon>
+			</ElTooltip>
+		</div>
+		<div 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>
+		<ElDivider />
+		<div class="flex items-center gap-[10px]">
+			<ElCheckbox v-model="mainStore.config.disbleListenner">不监听任何端口，只连接到对等节点</ElCheckbox>
+			<ElTooltip content="无法联机时，可以尝试开启这个选项">
+				<ElIcon><QuestionFilled /></ElIcon>
+			</ElTooltip>
+		</div>
+		<div class="flex items-center gap-[10px]">
+			<ElText
+				class="flex-shrink-0"
+				size="small"
+			>
+				监听端口
+			</ElText>
+			<ElInput
+				:disabled="mainStore.config.disbleListenner || mainStore.config.enableCustomListener"
+				size="small"
+				:maxlength="10"
+				v-model="mainStore.config.port"
+				placeholder="请输入端口号"
+			/>
+		</div>
+		<div class="flex items-center gap-[10px]">
+			<ElCheckbox
+				:disabled="mainStore.config.disbleListenner"
+				v-model="mainStore.config.enableCustomListener"
+			>
+				自定义监听地址
+			</ElCheckbox>
+			<ElButton
+				size="small"
+				:disabled="mainStore.config.disbleListenner"
+				@click="handleListenerDialog"
+			>
+				填写
+			</ElButton>
+			<ElDialog
+				width="95%"
+				top="10px"
+				append-to-body
+				:z-index="10"
+				class="!mb-0"
+				v-model="listenerDialogData.visible"
+				:close-on-press-escape="false"
+				title="自定义监听地址"
+			>
+				<ElInput
+					type="textarea"
+					:rows="8"
+					placeholder="请输入监听地址一行一个"
+					v-model="mainStore.config.customListenerData"
+				></ElInput>
+				<template #footer>
+					<div class="text-right">
+						<ElButton
+							size="default"
+							@click="handleFinishInputListener"
+							type="primary"
+						>
+							确定
+						</ElButton>
+					</div>
+				</template>
+			</ElDialog>
+		</div>
+		<div class="flex items-center gap-[10px]">
+			<ElCheckbox
+				:disabled="mainStore.config.disbleListenner"
+				v-model="mainStore.config.enableCustomListenerV6"
+			>
+				自定义IPV6监听地址
+			</ElCheckbox>
+			<div class="w-[200px]">
+				<ElInput
+					:disabled="mainStore.config.disbleListenner || mainStore.config.enableCustomListenerV6"
+					size="small"
+					:maxlength="100"
+					v-model="mainStore.config.customListenerV6Data"
+					placeholder="请输入自定义IPV6监听地址"
+				/>
+			</div>
+			<ElTooltip content="例如：tcp://[::]:11010，如果未设置，将在随机UDP端口上监听">
+				<ElIcon><QuestionFilled /></ElIcon>
+			</ElTooltip>
+			<CoreVersionWarning version="2.1.0" />
+		</div>
+		<ElDivider />
+		<div class="flex items-center gap-[10px]">
+			<ElCheckbox v-model="mainStore.config.devName">自定义网卡名</ElCheckbox>
+			<ElInput
+				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>
+		<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">为子网代理启用smoltcp堆栈</ElCheckbox>
+			<ElTooltip content="使用用户态TCP/IP协议栈smoltcp，避免操作系统防火墙问题导致无法子网代理">
+				<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
+					size="small"
+					v-model="mainStore.config.logLevel"
+					placeholder="请选择日志等级"
+					class="ml-[5px]"
+				>
+					<ElOption
+						v-for="item in data"
+						:key="item"
+						:label="`level - ${item}`"
+						:value="item"
+					></ElOption>
+				</ElSelect>
+			</div>
+			<ElButton
+				@click="openLogDir"
+				size="small"
+			>
+				打开日志目录
+			</ElButton>
 		</div>
 	</div>
 </template>
 <script setup lang="ts">
 	import useMainStore from "@/stores/index";
-	import { getCurrentWindow } from "@tauri-apps/api/window";
+	import { QuestionFilled } from "@element-plus/icons-vue";
+	import { resourceDir as getResourceDir, join } from "@tauri-apps/api/path";
+	import { Command } from "@tauri-apps/plugin-shell";
+	import { exists, mkdir, BaseDirectory, 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 mainStore = useMainStore();
-	const appWindow = getCurrentWindow();
+	const data = ["trace", "debug", "info", "warn", "error", "off"];
-	mainStore.$subscribe((...a) => {
+	const guids = ref<string[][]>([]);
-		// console.log("subscribe", a);
+	const openLogDir = async () => {
-		appWindow.emitTo("main", "config", { config: { ...mainStore.config } });
+		const resourceDir = await getResourceDir();
+		const logPath = import.meta.env.VITE_LOG_PATH;
+		const logDirPath = await join(resourceDir, logPath);
+		const isExists = await exists(logPath, { baseDir: BaseDirectory.Resource });
+		if (!isExists) {
+			try {
+				await mkdir(logPath, { baseDir: BaseDirectory.Resource });
+			} catch (err) {}
+		}
+		await Command.create("explorer", [logDirPath]).execute();
+	};
+
+	const openConfigJsonDir = async () => {
+		const resourceDir = await getResourceDir();
+		const easytierDir = await join(resourceDir, "easytier/");
+		const isExists = await exists("easytier/", { baseDir: BaseDirectory.Resource });
+		if (isExists) {
+			await Command.create("explorer", [easytierDir]).execute();
+		} else {
+			ElMessage.error("config.json的目录不存在");
+		}
+	};
+
+	// 为bind_device功能增加改方法
+	const _getGuids = async () => {
+		const guidsValue = await invoke<string[][]>("get_network_adapter_guids");
+		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,6 +1,9 @@
 <template>
-	<div class="h-full flex flex-col gap-[10px]">
+	<div class="flex h-full flex-col gap-[10px]">
-		<ElRadioGroup v-model="mainStore.cidrEnable">
+		<ElRadioGroup
+			:disabled="!data.isSwitchEnable"
+			v-model="mainStore.cidrEnable"
+		>
 			<ElRadioButton :value="true">开启</ElRadioButton>
 			<ElRadioButton :value="false">关闭</ElRadioButton>
 		</ElRadioGroup>
@@ -9,17 +12,107 @@
 				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

@@ -5,7 +5,7 @@
 		v-model="data.log"
 		resize="none"
 		readonly
-		placeholder="等待日志中..."
+		placeholder="等待日志中，请先'启动联机'..."
 	/>
 </template>
 <script setup lang="ts">
@@ -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,31 +1,103 @@
 <template>
-	<div class="overflow-auto h-full">
+	<div class="h-full overflow-auto">
 		<div class="w-[1200px]">
-			<span v-if="!data.member || data.member.length <= 0">{{ "等待成员信息中..." }}</span>
+			<ElText
+				size="small"
+				v-if="!data.member || data.member.length <= 0"
+			>
+				{{ "等待成员信息中..." }}
+			</ElText>
 			<ElTable
 				stripe
+				border
 				:data="data.member"
 				v-else
 			>
 				<ElTableColumn
-					v-for="prop in showTableHeader"
+					sortable
-					:label="prop[1]"
+					width="140"
-					:key="prop[0]"
+					label="成员名"
+					prop="hostname"
+				>
+					<template #default="{ row }">
+						{{
+							(row.hostname || "").toLowerCase().includes("publicserver")
+								? (row.hostname || "").replace("PublicServer", "服务器")
+								: row.hostname || "-"
+						}}
+					</template>
+				</ElTableColumn>
+				<ElTableColumn
+					sortable
+					width="90"
+					prop="cost"
+					label="方式"
 				>
 					<template #default="{ row }">
-						<span v-if="prop[0] == 'loss_rate'">
-							{{ row[prop[0]] && row[prop[0]] != "-" ? Number(row[prop[0]] * 100).toFixed(2) + "%" : row[prop[0]] }}
-						</span>
-						<span v-else-if="prop[0] != 'cost'">{{ row[prop[0]] }}</span>
 						<ElTag
-							v-else
+							size="small"
 							effect="dark"
-							:type="row[prop[0]] == 'p2p' ? 'success' : 'info'"
+							:type="row.cost == 'p2p' ? 'success' : 'info'"
 						>
-							{{ row[prop[0]] }}
+							{{ row.cost ? row.cost.replace("relay", "中转").replace("p2p", "直连") : row.cost }}
 						</ElTag>
 					</template>
 				</ElTableColumn>
+				<ElTableColumn
+					sortable
+					width="120"
+					prop="ipv4"
+					label="虚拟网IP"
+				></ElTableColumn>
+				<ElTableColumn
+					sortable
+					prop="lat_ms"
+					width="100"
+					label="延迟/ms"
+				></ElTableColumn>
+				<ElTableColumn
+					sortable
+					width="100"
+					prop="loss_rate"
+					label="丢包率"
+				>
+					<template #default="{ row }">
+						{{ row.loss_rate && row.loss_rate != "-" ? Number(row.loss_rate * 100).toFixed(2) + "%" : row.loss_rate }}
+					</template>
+				</ElTableColumn>
+				<ElTableColumn
+					sortable
+					width="110"
+					label="NAT类型"
+					prop="nat_type"
+				>
+					<template #default="{ row }">
+						{{ natMaps[row.nat_type.toLowerCase() as natKyes] || row.nat_type || "-" }}
+					</template>
+				</ElTableColumn>
+				<ElTableColumn
+					sortable
+					width="122"
+					prop="version"
+					label="版本"
+				></ElTableColumn>
+				<ElTableColumn
+					sortable
+					width="100"
+					prop="tunnel_proto"
+					label="隧道协议"
+				></ElTableColumn>
+				<ElTableColumn
+					sortable
+					width="90"
+					prop="rx_bytes"
+					label="接收"
+				></ElTableColumn>
+				<ElTableColumn
+					sortable
+					prop="tx_bytes"
+					label="传输"
+				></ElTableColumn>
 			</ElTable>
 		</div>
 	</div>
@@ -33,161 +105,108 @@
 <script setup lang="ts">
 	import { invoke } from "@tauri-apps/api/core";
 	import { reactive, onMounted, onBeforeUnmount } from "vue";
-	const data = reactive<{ member: any[] }>({
+	import { ATJ, parseCliInfo } from "@/utils";
+	import { ElConfirmDanger } from "~/utils/element";
+	import { getCurrentWindow } from "@tauri-apps/api/window";
+	// 	enum NatType {
+	//   // has NAT; but own a single public IP, port is not changed
+	//   Unknown = 0;
+	//   OpenInternet = 1;
+	//   NoPAT = 2;
+	//   FullCone = 3;
+	//   Restricted = 4;
+	//   PortRestricted = 5;
+	//   Symmetric = 6;
+	//   SymUdpFirewall = 7;
+	//   SymmetricEasyInc = 8;
+	//   SymmetricEasyDec = 9;
+	// }
+	const natMaps = {
+		unknown: "未知",
+		OpenInternet: "nat0-openinternet",
+		nopat: "nat0-nopat",
+		fullcone: "nat1",
+		restricted: "nat2",
+		portrestricted: "nat3",
+		symmetric: "nat4",
+		symmetriceasydec: "nat4-easydec",
+		symmetriceasyinc: "nat4-easyinc",
+		symUdpfirewall: "nat4-udpfirewall"
+	};
+	type natKyes = keyof typeof natMaps;
+
+	const data = reactive<{ member: { hostname: string; cost: string; ipv4: string; lat_msg: string; loss_rate: string; nat_type: string }[] }>({
 		member: []
 	});
 
-	const showTableHeader = [
+	const _showTableHeader = [
-		["ipv4", "虚拟网IP"],
 		["hostname", "主机名"],
 		["cost", "路由"],
+		["ipv4", "虚拟网IP"],
 		["lat_ms", "延迟/ms"],
 		["loss_rate", "丢包率"],
-		["version", "版本"]
+		["nat_type", "NAT类型"],
+		["version", "版本"],
+		["tunnel_proto", "隧道协议"],
+		["rx_bytes", "接收"],
+		["tx_bytes", "传输"]
 	];
-	const headers = [
-		"ipv4",
-		"hostname",
-		"cost",
-		"lat_ms",
-		"loss_rate",
-		"rx_bytes",
-		"rx_unit",
-		"tx_bytes",
-		"tx_unit",
-		"tunnel_proto",
-		"nat_type",
-		"id",
-		"version"
-	];
-
-	const formatData = (data: any[]) => {
-		if (!data) return [];
-		const result = [];
-		let obj: any = {};
-		let length = data.length;
-		for (let idx = 0; idx < length; idx++) {
-			let headersIdx = idx % headers.length;
-			if (headersIdx === 0) {
-				// console.log(idx, [...data]);
-				obj = {};
-				result.push(obj);
-			}
-			if (["ipv4"].includes(headers[headersIdx]) && !/\d+\.\d+\.\d+\.\d\/\d+/.test(data[idx]) && data[idx]) {
-				const next = data[idx];
-				data[idx] = "-";
-				const head = data.slice(0, idx);
-				const latest = data.slice(idx);
-				data = [...head, next, ...latest];
-				length = data.length;
-			} else if (["rx_bytes", "tx_bytes"].includes(headers[headersIdx]) && data[idx] == "-") {
-				const head = data.slice(0, idx);
-				const latest = data.slice(idx);
-				data = [...head, "-", ...latest];
-				length = data.length;
-			} else if (
-				["tunnel_proto"].includes(headers[headersIdx]) &&
-				![
-					"tcp",
-					"udp",
-					"ws",
-					"wss",
-					"wg",
-					"-",
-					"tcp,udp",
-					"ws,wss",
-					"tcp,udp,ws,wss,wg",
-					"tcp,ws,wss,wg",
-					"udp,ws,wss,wg",
-					"tcp,wg",
-					"udp,wg",
-					"tcp,ws",
-					"tcp,wss",
-					"udp,ws",
-					"udp,wss",
-					"tcp,udp,ws",
-					"tcp,udp,wss",
-					"tcp,udp,ws,wss",
-					"tcp,udp,ws,wss,wg",
-					"tcp,udp,wg",
-					"tcp,udp,ws,wg",
-					"udp,tcp",
-					"udp,tcp,ws",
-					"udp,tcp,wss",
-					"udp,tcp,ws,wss",
-					"udp,tcp,ws,wss,wg",
-					"udp,tcp,wg",
-					"udp,tcp,ws,wg",
-					"tcp,udp,wss,wg",
-					"tcp,udp,ws,wg",
-					"tcp,udp,wss,wg",
-					"ws,tcp",
-					"ws,udp",
-					"ws,tcp,udp",
-					"ws,tcp,udp,ws",
-					"ws,tcp,udp,wss",
-					"ws,tcp,udp,ws,wss",
-					"ws,tcp,udp,ws,wss,wg",
-					"ws,tcp,udp,wg",
-					"ws,tcp,udp,ws,wg",
-					"ws,udp,tcp",
-					"ws,udp,tcp,ws",
-					"ws,udp,tcp,wss",
-					"ws,udp,tcp,ws,wss",
-					"wss,tcp",
-					"wss,udp",
-					"wss,tcp,udp",
-					"wss,tcp,udp,ws",
-					"wss,tcp,udp,wss",
-					"wss,tcp,udp,ws,wss",
-					"wss,tcp,udp,ws,wss,wg",
-					"wss,tcp,udp,wg",
-					"wg,tcp",
-					"wg,udp",
-					"wg,tcp,udp",
-					"wg,tcp,udp,ws",
-					"wg,tcp,udp,wss",
-					"wg,tcp,udp,ws,wss",
-					"wg,tcp,udp,ws,wss,wg",
-					"wg,tcp,udp,wg",
-					"wg,udp,tcp"
-				].includes(data[idx])
-			) {
-				const head = data.slice(0, idx);
-				const latest = data.slice(idx);
-				data = [...head, "-", ...latest];
-				length = data.length;
-			}
-			obj[headers[headersIdx]] = data[idx];
-		}
-		return result;
-	};
-
-	const listenOutput = async () => {
-		const member = await invoke("get_members_by_cli");
-		let memberData = ((member as string) || "")
-			.replace(/[\│\├\┌\└\─\┬\┴\┼\┤\┐\┘]+/g, "")
-			.split(" ")
-			.filter(el => el && !["\n", "\n\n"].includes(el))
-			.slice(11);
-		if (memberData.length <= 0) {
-			return;
-		}
-		const result = formatData(memberData);
-		data.member = result;
-		// console.log({ member: data.member });
-	};
 
 	let timer: NodeJS.Timeout | null = null;
 
-	onMounted(async () => {
+	const listenOutput = async () => {
-		listenOutput();
+		const [error, member] = await ATJ(invoke<string>("get_members_by_cli"));
-		timer = setInterval(() => {
+		// if(!member) return;
+		if (error) {
+			data.member = [];
+			return "";
+		}
+		if (member === "_EasytierGameCliFailedToConnect_") {
+			data.member = [];
+			stopTimer();
+			const [error] = await ElConfirmDanger("连接已断开,是否重新尝试?", "警告", {
+				confirmButtonText: "重试",
+				cancelButtonText: "关闭窗口"
+			});
+			if (!error) {
+				await listenOutput();
+			} else {
+				const appWindow = getCurrentWindow();
+				await appWindow.close();
+			}
+			return;
+		}
+		const peerInfo = parseCliInfo(member);
+		peerInfo.forEach(value => {
+			if (value.cost === "Local") {
+				value.cost = "本机";
+			}
+			if (value.ipv4 && value.ipv4.includes("/")) {
+				value.ipv4 = value.ipv4.split("/")[0];
+			}
+		});
+		// console.log(peerInfo)
+		data.member = peerInfo;
+		startTimer();
+	};
+
+	const startTimer = () => {
+		timer && clearTimeout(timer);
+		timer = setTimeout(() => {
 			listenOutput();
-		}, 1000 * 10);
+		}, 1000);
+	};
+
+	const stopTimer = () => {
+		timer && clearTimeout(timer);
+		timer = null;
+	};
+
+	onMounted(async () => {
+		await listenOutput();
 	});
 
 	onBeforeUnmount(() => {
-		timer && clearInterval(timer);
+		stopTimer();
 	});
 </script>

pages/server.vue

@@ -0,0 +1,128 @@
+<template>
+	<div class="flex flex-col gap-[10px] h-full">
+		<ElForm
+			size="small"
+			label-position="top"
+			:model="mainStore.serverConfig"
+		>
+			<ElFormItem
+				label="白名单"
+				prop="ServerWhiteList"
+				class="full-label full-content overflow-hidden !flex flex-col h-full !mb-[0]"
+			>
+				<template #label>
+					<div class="flex items-center gap-[10px]">
+						白名单
+						<ElSwitch
+							v-model="mainStore.serverConfig.enableWhiteList"
+							inline-prompt
+							active-text="启用"
+							inactive-text="禁用"
+						></ElSwitch>
+
+						<div class="ml-auto">
+							<ElTooltip
+								placement="top"
+								content="打开软件的时候，就会开启这个自建服务"
+							>
+								<ElCheckbox v-model="mainStore.serverConfig.autoStart">自动启动</ElCheckbox>
+							</ElTooltip>
+							<ElTooltip
+								placement="top"
+								content="帮助其他虚拟网建立P2P链接"
+							>
+								<ElCheckbox v-model="mainStore.serverConfig.relayAllPeerrpc">转发所有对等节点的RPC数据包</ElCheckbox>
+							</ElTooltip>
+						</div>
+					</div>
+				</template>
+				<div class="h-full w-full flex flex-col overflow-hidden">
+					<div class="flex-1 overflow-auto">
+						<ElInput
+							:disabled="!mainStore.serverConfig.enableWhiteList"
+							placeholder="一行一个，支持通配符列表，如（ab*）。当该参数的列表为空时，就不会为所有其他网络提供转发服务。"
+							:maxlength="1000"
+							v-model="mainStore.serverConfig.serverWhiteList"
+							type="textarea"
+							:rows="3"
+							resize="none"
+						></ElInput>
+					</div>
+				</div>
+			</ElFormItem>
+		</ElForm>
+		<div class="flex items-center gap-[10px]">
+			<div class="flex items-center gap-[5px]">
+				<ElText>服务器端口</ElText>
+				<div class="max-w-[100px]">
+					<ElTooltip content="端口号">
+						<ElInput v-model="mainStore.serverConfig.port"></ElInput>
+					</ElTooltip>
+				</div>
+			</div>
+			<ElButton
+				size="large"
+				:loading="data.loading"
+				:type="data.isStart ? 'danger' : 'primary'"
+				@click="hanldeClickStart"
+			>
+				{{ !data.isStart ? "启动服务器" : "停止服务器" }}
+			</ElButton>
+		</div>
+
+		<ElInput
+			placeholder="服务器日志"
+			:model-value="data.log"
+			type="textarea"
+			:rows="14"
+			resize="none"
+		></ElInput>
+	</div>
+</template>
+<script setup lang="ts">
+	import useMainStore from "@/stores/index";
+	import { reactive, onMounted, onBeforeUnmount } from "vue";
+	import { getCurrentWindow } from "@tauri-apps/api/window";
+	import { listen, type UnlistenFn } from "@tauri-apps/api/event";
+	import { getServerArgs } from "@/composables/server";
+	import { dataSubscribe } from "@/composables/windows";
+
+    const appWindow = getCurrentWindow();
+	const mainStore = useMainStore();
+	const data = reactive({
+		log: "",
+		isStart: false,
+		loading: true
+	});
+
+	const listenStart = async () => {
+		const unListen = await listen<{ log: string; threadId: number | null }>("server_logs", event => {
+			data.log = event.payload.log || "";
+			if (event.payload.threadId) {
+				data.isStart = true;
+			} else {
+				data.isStart = false;
+			}
+			data.loading = false;
+		});
+		return unListen;
+	};
+
+	let unlistenStart: UnlistenFn | null = null;
+	onMounted(async () => {
+		unlistenStart = await listenStart();
+	});
+
+	onBeforeUnmount(() => {
+		unlistenStart && unlistenStart();
+	});
+
+	const hanldeClickStart = async () => {
+		data.loading = true;
+        const args = getServerArgs();
+		await appWindow.emitTo("main", "startStopServer", { args });
+	};
+
+	dataSubscribe();
+
+</script>

pages/tool.vue

@@ -0,0 +1,497 @@
+<template>
+	<div class="h-full overflow-auto">
+		<ElTabs
+			v-model="data.activeTab"
+			@tab-change="handleTabsChange"
+			class="h-full"
+		>
+			<ElTabPane
+				label="联机失败解决办法"
+				name="netcard"
+				class="flex h-full flex-col"
+			>
+				<div>
+					<div>
+						<ElTooltip
+							content="找不到游戏房间时，就开启它后再尝试搜索房间(默认开启)
+                        例如: 一个游戏玩家，有时通过本地局域网联机，有时通过某些联机工具进行联机，但是他只能在其中一个联机方式里看到朋友的游戏房间，而另一个里看不到，这时就可以使用这个工具，让他在两个地方都能看到游戏房间"
+						>
+							<ElText>
+								方案1
+								<ElIcon class="ml-[3px]"><QuestionFilled /></ElIcon>
+							</ElText>
+						</ElTooltip>
+					</div>
+					<ElLink
+						class="mr-[10px] !text-[15px]"
+						type="info"
+						:underline="false"
+						@click="open('https://github.com/dechamps/WinIPBroadcast/releases/tag/winipbroadcast-1.6')"
+					>
+						WinIPBroadcast
+					</ElLink>
+					<ElSwitch
+						inline-prompt
+						:model-value="mainStore.winipBcStart"
+						@change="handleWinipBcStart"
+						size="small"
+						label="WinIPBroadcast"
+						active-text="已开启"
+						inactive-text="已关闭"
+					></ElSwitch>
+				</div>
+				<div>
+					<ElTooltip
+						content="使用ForceBindIP启动应用 (强制绑定IP或者网卡)，如果还没有启动联机，请先启动联机，联机成功后，点击刷新获取easytier生成的网卡"
+					>
+						<ElText>
+							方案2
+							<ElIcon class="ml-[3px]"><QuestionFilled /></ElIcon>
+						</ElText>
+					</ElTooltip>
+				</div>
+				<div>
+					<div>
+						<ElLink
+							class="!text-[15px]"
+							type="info"
+							:underline="false"
+							@click="open('https://r1ch.net/projects/forcebindip')"
+						>
+							ForceBindIP
+						</ElLink>
+					</div>
+					<div>
+						<ElRadioGroup
+							class="mr-[30px]"
+							v-model="mainStore.forceBindIpBit"
+						>
+							<ElRadio
+								label="32位"
+								value="32"
+							></ElRadio>
+							<ElRadio
+								label="64位"
+								value="64"
+							></ElRadio>
+						</ElRadioGroup>
+						<ElTooltip
+							placement="top"
+							content="如果目标应用程序在启动时崩溃或出现其他意外行为，请尝试开启它，ForceBindIP 加载程序将等待应用程序进入其消息循环后再注入拦截 DLL"
+						>
+							<ElCheckbox
+								v-model="mainStore.delayInjectDll"
+								label="延迟注入DLL"
+							></ElCheckbox>
+						</ElTooltip>
+					</div>
+					<div class="flex items-center gap-[5px]">
+						<ElSelect
+							placeholder="请输入IP地址或选择网卡"
+							v-model="mainStore.forceBindInput"
+							filterable
+							allow-create
+							no-data-text="暂无网卡数据，请尝试刷新"
+						>
+							<ElOption
+								v-for="guid in data.guids"
+								:key="guid[0]"
+								:label="guid[1]"
+								:value="guid[0]"
+							></ElOption>
+						</ElSelect>
+						<ElButton @click="getGuids">刷新</ElButton>
+					</div>
+					<div class="mt-[5px] flex items-center gap-[5px]">
+						<ElInput
+							placeholder="请选择或输入应用程序路径"
+							:disabled="data.forceBindStart"
+							v-model="mainStore.forceBindFile"
+						></ElInput>
+						<div class="flex items-center">
+							<ElButton
+								@click="handleBrowser"
+								:disabled="data.forceBindStart"
+							>
+								浏览
+							</ElButton>
+							<ElButton
+								:disabled="data.forceBindStart"
+								@click="startForceBindIp"
+								type="primary"
+							>
+								启动
+							</ElButton>
+						</div>
+					</div>
+				</div>
+				<div>
+					<!-- const guids = await invoke<string[]>("get_network_adapter_guids"); -->
+				</div>
+				<div>
+					<ElTooltip content="设置网卡的跃点，提升网卡优先级，尝试将您联机使用的网卡跃点设置为最小，请先查询网卡信息">
+						<ElText>
+							方案3
+							<ElIcon class="ml-[3px]"><QuestionFilled /></ElIcon>
+						</ElText>
+					</ElTooltip>
+				</div>
+				<div class="mt-[5px] flex items-center">
+					<ElButton
+						@click="initNetCardInfo"
+						size="small"
+						type="primary"
+					>
+						查询网卡信息
+					</ElButton>
+					<div
+						v-if="data.row.name"
+						class="ml-auto flex flex-nowrap items-center gap-[10px]"
+					>
+						<ElTooltip content="跃点越小，网卡优先级越高，范围(1-9999)">
+							<ElInput
+								class="!w-[80px]"
+								autofocus
+								size="small"
+								v-model="data.row.metric"
+								placeholder="请输入跃点"
+							/>
+						</ElTooltip>
+						<ElButton
+							type="success"
+							size="small"
+							@click="handleSaveMetric"
+						>
+							保存
+						</ElButton>
+					</div>
+				</div>
+				<div class="mt-[5px] flex-1 overflow-auto">
+					<ElTable
+						height="100%"
+						empty-text="暂无数据"
+						highlight-current-row
+						:data="data.netcardList"
+						@row-click="handleRowClick"
+						border
+					>
+						<ElTableColumn
+							sortable
+							label="网卡名"
+							prop="name"
+						></ElTableColumn>
+						<ElTableColumn
+							sortable
+							label="跃点"
+							prop="metric"
+						></ElTableColumn>
+					</ElTable>
+				</div>
+			</ElTabPane>
+			<ElTabPane
+				label="防火墙"
+				name="firewall"
+				class="flex h-full flex-col"
+			>
+				<div class="flex flex-col items-center">
+					<div class="mb-[10px]">
+						<ElButton
+							type="warning"
+							size="small"
+						>
+							一键关闭防火墙
+						</ElButton>
+						<ElButton
+							@click="handleCustomFireWall"
+							type="danger"
+							size="small"
+						>
+							自定义防火墙策略
+						</ElButton>
+					</div>
+					<div class="mb-[10px]">
+						<ElText class="!mx-[10px]">域防火墙</ElText>
+						<ElTag :type="data.firewallStatus.domain ? 'danger' : 'success'">
+							{{ data.firewallStatus.domain ? "已开启" : "已关闭" }}
+						</ElTag>
+					</div>
+					<div class="mb-[10px]">
+						<ElText class="!mx-[10px]">公用防火墙</ElText>
+						<ElTag :type="data.firewallStatus.public ? 'danger' : 'success'">
+							{{ data.firewallStatus.public ? "已开启" : "已关闭" }}
+						</ElTag>
+					</div>
+					<div>
+						<ElText class="!mx-[10px]">专用防火墙</ElText>
+						<ElTag :type="data.firewallStatus.dedicated ? 'danger' : 'success'">
+							{{ data.firewallStatus.dedicated ? "已开启" : "已关闭" }}
+						</ElTag>
+					</div>
+				</div>
+				<ElDivider>Ping测试</ElDivider>
+				<div class="flex items-center gap-[10px]">
+					<ElInput
+						style="width: 150px"
+						size="small"
+						v-model="data.pingIp"
+						placeholder="请输入IP地址"
+					/>
+					<ElInputNumber
+						controls-position="right"
+						size="small"
+						:precision="0"
+						v-model="data.pingNum"
+						:min="1"
+						:max="10"
+					>
+						<template #suffix>
+							<span>次</span>
+						</template>
+					</ElInputNumber>
+					<ElButton
+						size="small"
+						:disabled="data.isPing"
+						@click="handleTestPing"
+					>
+						Ping一下
+					</ElButton>
+				</div>
+				<div class="mt-[5px] flex-1 overflow-auto">
+					<ElInput
+						placeholder="日志信息"
+						type="textarea"
+						:autosize="{ minRows: 9 }"
+						resize="none"
+						v-model="data.pingLog"
+					/>
+				</div>
+			</ElTabPane>
+		</ElTabs>
+	</div>
+</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 { 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<{ guids: string[][]; [key: string]: any }>({
+		activeTab: "netcard",
+		winipBcPid: 0,
+		pingNum: 1,
+		winipBcStart: false,
+		pingIp: "",
+		isPing: false,
+		pingLog: "",
+		firewallStatus: {
+			domain: false,
+			public: false,
+			dedicated: false
+		},
+		row: {
+			name: "",
+			metric: ""
+		},
+		netcardList: [],
+		guids: [],
+		forceBindStart: false
+	});
+
+	const handleCustomFireWall = async () => {
+		await open("wf.msc");
+	}
+
+	const handleTabsChange = async (tabPaneName: TabPaneName) => {
+		if (tabPaneName === "netcard") {
+			// await initNetCardInfo();
+		} else if (tabPaneName == "firewall") {
+			await initFirewall();
+		}
+	};
+
+	const handleRowClick = async (row: any, column: any, event: Event) => {
+		data.row = { ...row };
+	};
+
+	const handleSaveMetric = async () => {
+		if (data.row.metric && data.row.name) {
+			try {
+				const output = await Command.create("netsh", ["interface", "ipv4", "set", "interface", data.row.name, "metric=", data.row.metric], {
+					encoding: "gb2312"
+				}).execute();
+				ElMessage.success("设置成功");
+				await initNetCardInfo();
+			} catch (err) {
+				console.error(err);
+			}
+		}
+	};
+
+	const awaitTime = (time: number) => {
+		return new Promise(res => {
+			setTimeout(res, time);
+		});
+	};
+
+	const handleTestPing = async () => {
+		// const is = isValidIP(data.pingIp);
+		if (data.pingIp) {
+			data.pingLog = "";
+			data.isPing = true;
+			try {
+				for (let i = 0; i < data.pingNum; i++) {
+					const output = await Command.create("ping", ["-n", "1", data.pingIp], {
+						encoding: "gb2312"
+					}).execute();
+					if (output.stdout) {
+						data.pingLog += `${i + 1} - ${output.stdout.split("\n")[2]}`;
+					}
+					if (output.stderr) {
+						data.pingLog += `${i + 1}error - ${output.stderr}`;
+					}
+					if (i != data.pingNum - 1) {
+						await awaitTime(1000);
+					}
+				}
+				data.pingLog += "完毕";
+			} catch (err) {
+				ElMessage.error("Ping发生错误");
+				console.error(err);
+			} finally {
+				data.isPing = false;
+			}
+		} else {
+			ElMessage.error("请输入正确的IP");
+		}
+	};
+
+	const initNetCardInfo = async () => {
+		try {
+			const output = await Command.create("netsh", ["interface", "ipv4", "show", "interface"], {
+				encoding: "gb2312"
+			}).execute();
+			data.netcardList = output.stdout
+				.split("\n")
+				.map(el => el.trim().replace(/\s+/g, " "))
+				.filter(el => el)
+				.slice(2)
+				.map(el => {
+					const [idx, Met, MTU, status, ...rest] = el.split(" ");
+					return {
+						index: idx,
+						metric: Met,
+						MTU,
+						status,
+						name: rest.join(" ")
+					};
+				}) as any;
+		} catch (err) {
+			ElMessage.error("网卡获取失败");
+			console.error(err);
+		}
+	};
+
+	const initFirewall = async () => {
+		try {
+			const output = await Command.create("netsh", ["advfirewall", "show", "allprofiles", "state"], {
+				encoding: "gb2312"
+			}).execute();
+			const state = output.stdout
+				.trim()
+				.replace(/[\-]+/g, "")
+				.split("\n")
+				.map(el => el.trim())
+				.filter(el => el)
+				.slice(0, -1);
+			for (let idx = 0; idx < state.length; idx += 2) {
+				const status = state[idx + 1].replace(/状态\s+/, "");
+				const matchName = /域|公用|专用/.exec(state[idx]);
+				if (matchName) {
+					const name = matchName[0];
+					if (name == "域") {
+						data.firewallStatus.domain = status != "关闭";
+					} else if (name == "公用") {
+						data.firewallStatus.public = status != "关闭";
+					} else if (name == "专用") {
+						data.firewallStatus.dedicated = status != "关闭";
+					}
+				}
+			}
+		} catch (err) {
+			// netsh advfirewall firewall add rule name="EXE名称" dir=out action=allow program="EXE绝对路径"
+			ElMessage.error("获取防火墙状态失败");
+			console.error(err);
+		}
+	};
+
+	const handleBrowser = async () => {
+		const file = await dialogOpen({
+			multiple: false,
+			directory: false
+		});
+		if (file) {
+			mainStore.forceBindFile = file;
+		} else {
+			ElMessage.error("获取文件路径失败");
+		}
+	};
+
+	const startForceBindIp = async () => {
+		if (!mainStore.forceBindInput) {
+			return ElMessage.error("请输入IP地址或者选择一个网卡");
+		}
+		if (!mainStore.forceBindFile) {
+			return ElMessage.error("请选择一个执行文件");
+		}
+
+		const forceBindIpExe = mainStore.forceBindIpBit == "32" ? "ForceBindIP" : "ForceBindIP64";
+		const isExists = await exists(`easytier/tool/${forceBindIpExe}.exe`, { baseDir: BaseDirectory.Resource });
+		if (!isExists) {
+			return ElMessage.error("forcebindIP文件不存在");
+		}
+
+		data.forceBindStart = true;
+		try {
+			const dealyDll = mainStore.delayInjectDll ? "-i" : "";
+			const child = await Command.create(
+				forceBindIpExe,
+				[dealyDll, mainStore.forceBindInput, mainStore.forceBindFile.replace(/\//g, "\\")].filter(el => el),
+				{
+					encoding: "gb2312"
+				}
+			).spawn();
+			// console.log({child});
+		} catch (err) {
+			ElMessage.error("forcebindIP启动发生未知错误");
+			console.error(err);
+		} finally {
+			data.forceBindStart = false;
+		}
+	};
+
+	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>

plugins/pinia.ts

@@ -1,10 +0,0 @@
-import { createPersistedState } from "pinia-plugin-persistedstate";
-import { defineNuxtPlugin } from "nuxt/app";
-export default defineNuxtPlugin((nuxtApp: any) => {
-	nuxtApp.$pinia.use(
-		createPersistedState({
-			storage: localStorage,
-			key: id => `__glj_persisted_${id}`
-		})
-	);
-});

src-tauri/.gitignore

@@ -2,5 +2,5 @@
 # will have compiled files and executables
 /target/
 /gen/schemas
-/easytier-windows-x86_64-v2.0.3.zip
+/easytier/logs
-/easytier-windows-x86_64/
+/easytier/logs/*.*

src-tauri/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "easytier-game"
-version = "1.0.7"
+version = "1.4.2"
 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,27 +18,41 @@ name = "app_lib"
 crate-type = ["staticlib", "cdylib", "rlib"]
 
 [build-dependencies]
-tauri-build = { version = "2.0.2", features = [] }
+tauri-build = { version = "2.0.6", features = [] }
 # prost-build = "0.13.2"
 
 [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.0.6", features = [
+tauri = { version = "2.3.0", features = [ "protocol-asset",
     "tray-icon",
     "image-png",
-    "image-ico",
+    "image-ico"
 ] }
-tauri-plugin-log = "2.0.1"
+
-tauri-plugin-shell = "2.0.2"
+tauri-plugin-log = "2.2.2"
-reqwest = { version = "0.12", features = ["json"] }
+tauri-plugin-shell = "2.2.0"
-zip = "2.2.0"
+reqwest = { version = "0.12.12", features = ["json"] }
-sysinfo = '0.32.0'
+zip = "2.2.3"
+sysinfo = '0.33.1'
 planif = { git = "https://github.com/mattrobineau/planif", tag = "1.0.1" }
+whoami = "1.5.2"
+tauri-plugin-fs = "2.2.0"
+tauri-plugin-clipboard-manager = "2.2.1"
+rand = "0.9.0"
+tokio = { version = "1.43.0", features = ["process"] }
+tauri-plugin-dialog = "2.2.0"
 # 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", "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.2"
+tauri-plugin-window-state = "2.2.1"

src-tauri/capabilities/default.json

@@ -2,12 +2,15 @@
 	"$schema": "../gen/schemas/desktop-schema.json",
 	"identifier": "default",
 	"description": "enables the default permissions",
-	"windows": ["main", "log", "member", "cidr", "advance"],
+	"windows": ["main", "log", "member", "cidr", "advance", "tool", "server", "gameList"],
 	"permissions": [
 		"core:default",
 		"core:window:allow-minimize",
+		"core:window:allow-unminimize",
 		"core:window:allow-hide",
 		"core:window:allow-close",
+		"core:window:allow-set-focus",
+		"core:window:allow-is-visible",
 		"shell:allow-open",
 		"core:window:allow-show",
 		"core:window:allow-create",
@@ -20,10 +23,6 @@
 		"core:webview:allow-webview-show",
 		"core:webview:allow-webview-hide",
 		"core:webview:allow-webview-close",
-		"autostart:default",
-		"autostart:allow-enable",
-		"autostart:allow-disable",
-		"autostart:allow-is-enabled",
 		"core:tray:allow-get-by-id",
 		"core:tray:allow-set-icon",
 		"core:tray:allow-new",
@@ -32,8 +31,18 @@
 			"allow": [
 				{
 					"args": ["run"],
-					"cmd": "WinIPBroadcast",
+					"cmd": "$RESOURCE/easytier/tool/WinIPBroadcast",
 					"name": "WinIPBroadcast"
+				},
+				{
+					"args": true,
+					"cmd": "$RESOURCE/easytier/tool/ForceBindIP",
+					"name": "ForceBindIP"
+				},
+				{
+					"args": true,
+					"cmd": "$RESOURCE/easytier/tool/ForceBindIP64",
+					"name": "ForceBindIP64"
 				}
 			]
 		},
@@ -42,10 +51,73 @@
 			"allow": [
 				{
 					"args": ["run"],
-					"cmd": "WinIPBroadcast",
+					"cmd": "$RESOURCE/easytier/tool/WinIPBroadcast",
 					"name": "WinIPBroadcast"
+				},
+				{
+					"args": true,
+					"cmd": "$RESOURCE/easytier/tool/ForceBindIP",
+					"name": "ForceBindIP"
+				},
+				{
+					"args": true,
+					"cmd": "$RESOURCE/easytier/tool/ForceBindIP64",
+					"name": "ForceBindIP64"
+				},
+				{
+					"args": true,
+					"cmd": "$RESOURCE/easytier/tool/nssm",
+					"name": "nssm"
+				},
+				{
+					"args": true,
+					"cmd": "explorer",
+					"name": "explorer"
+				},
+				{
+					"args": true,
+					"cmd": "wf.msc",
+					"name": "wf.msc"
+				},
+				{
+					"args": true,
+					"cmd": "netsh",
+					"name": "netsh"
+				},
+				{
+					"args": true,
+					"cmd": "ping",
+					"name": "ping"
+				},
+				{
+					"args": true,
+					"cmd": "powershell",
+					"name": "powershell"
 				}
 			]
-		}
+		},
+		"fs:default",
+		{
+			"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/README.md

@@ -0,0 +1 @@
+这里存放每次打包需要用到的最新版本的easytier 和 相关工具

src-tauri/easytier/clear_local_data.bat

@@ -0,0 +1,57 @@
+@echo off
+chcp 65001 >nul
+setlocal
+
+REM 检查是否具有管理员权限
+openfiles >nul 2>&1
+if %errorlevel% neq 0 (
+    echo 当前没有管理员权限，鼠标右键clear_data.bat，选择使用管理员模式运行...
+    pause
+    exit /b
+)
+
+REM 获取当前用户的 Local 目录路径
+set "local_dir=%LOCALAPPDATA%"
+
+REM 设置要删除的任务计划程序文件夹名称
+set "folder_name=\easytierGame"
+set "task_name=auto start"
+
+REM 设置要删除的目标文件夹
+set "target_data_dir=%local_dir%\com.tauri.easytier-game"
+echo ---
+REM 打印 Local 目录路径
+echo 当前数据目录: %target_data_dir%
+echo ---
+echo 您确定要清除EasytierGame的本地数据吗? (y/n)
+echo ---
+
+REM 等待用户输入
+set /p confirm=输入'y/n'进行确认:
+
+if /i "%confirm%"=="y" (
+    echo 清除数据中,请稍后...
+    echo ---
+    @REM REM 删除任务计划程序文件夹
+    echo delete auto_start task ...
+    echo ---
+
+    echo ---
+    schtasks /delete /tn "%folder_name%\%task_name%" /f
+    schtasks /delete /tn "%folder_name%" /f
+    echo ---
+    echo 开始清除本地缓存数据，没有使用开机自启上面就会报错，不影响数据清理...
+
+    if exist "%target_data_dir%" (
+        REM 删除目标文件夹及其内容
+        rd /s /q "%target_data_dir%"
+    )
+    echo 清除本地缓存数据完毕.
+    echo ---
+    echo 您可以手动删除EasytierGame目录下所有文件，即可完成卸载.
+) else (
+    echo 取消清理数据
+)
+
+pause
+endlocal

src-tauri/easytier/config/config_template.toml

@@ -0,0 +1,77 @@
+# 实例名称，用于在同一台机器上标识此节点
+instance_name = ""
+# 主机名，用于标识此设备的主机名
+hostname = ""
+# 实例 ID，一般为 UUID，在同一个虚拟网络中唯一
+instance_id = ""
+# 此节点的虚拟网 IPv4 地址，如果为空，则此节点将仅转发数据包，不会创建 TUN 设备
+ipv4 = ""
+# 由 Easytier 自动确定并设置IP地址，默认从10.0.0.1开始。警告：在使用 DHCP 时，如果网络中出现 IP 冲突，IP 将自动更改
+dhcp = false
+
+# 监听器列表，用于接受连接
+listeners = [
+"tcp://0.0.0.0:11010",
+"udp://0.0.0.0:11010",
+"wg://0.0.0.0:11011",
+"ws://0.0.0.0:11011/",
+"wss://0.0.0.0:11012/",
+]
+
+# 退出节点列表
+exit_nodes = [
+]
+
+# 用于管理的 RPC 门户地址
+rpc_portal = "127.0.0.1:15888"
+
+[network_identity]
+# 网络名称，用于标识虚拟网络
+network_name = ""
+# 网络密钥，用于验证此节点属于虚拟网络
+network_secret = ""
+
+# 这里是对等连接节点配置，可以多段配置
+[[peer]]
+uri = "tcp://public.easytier.top:11010"
+
+[[peer]]
+uri = "udp://public.easytier.top:11010"
+
+# 这里是子网代理节点配置，可以有多段配置
+[[proxy_network]]
+cidr = "10.0.1.0/24"
+
+[[proxy_network]]
+cidr = "10.0.2.0/24"
+
+# WireGuard 配置信息
+[vpn_portal_config]
+# WireGuard 客户端所在的网段，下面为示例
+client_cidr = "10.14.14.0/24"
+#wg所监听的端口(请勿和listeners的wg冲突)
+wireguard_listen = "0.0.0.0:11012"
+
+[flags]
+# 连接到对等节点使用的默认协议
+default_protocol = "tcp"
+# TUN 设备名称，如果为空，则使用默认名称
+dev_name = ""
+# 禁用p2p
+disable_p2p = false
+# 是否启用加密
+enable_encryption = true
+# 是否启用 IPv6 支持
+enable_ipv6 = true
+# TUN 设备的 MTU
+mtu = 1380
+# 延迟优先模式，将尝试使用最低延迟路径转发流量，默认使用最短路径
+latency_first = false
+# 将本节点配置为退出节点
+enable_exit_node = false
+# 禁用 TUN 设备
+no_tun = false
+# 为子网代理启用 smoltcp 堆栈
+use_smoltcp = false
+# 仅转发白名单网络的流量，支持通配符字符串。多个网络名称间可以使用英文空格间隔。如果该参数为空，则禁用转发。默认允许所有网络。例如：'*'（所有网络），'def*'（以def为前缀的网络），'net1 net2'（只允许net1和net2）
+foreign_network_whitelist = "*"

src-tauri/easytier/config_template.json

@@ -0,0 +1,40 @@
+{
+    // 如果您的配置过于复杂，可以参考 使用配置文件进行联机的办法，以下是基础的界面配置，用于快速分享联机
+    "protocol": [
+        "tcp",
+        "udp"
+    ], // 协议类型
+    // easytier服务地址 - 可填写多个 方式1，逗号分隔，"xxxx.cn,yyyy.com" 方式2,数组 ["xxxx.cn","yyyy.com"] （默认选中第一个）
+    "serverUrl": "public.easytier.top:11010",
+    "enableCustomListener": true,
+    "customListenerData": [
+        "tcp://0.0.0.0:11010",
+        "udp://0.0.0.0:11010",
+        "tcp://[::]:11010"
+    ],
+    "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打洞
+    "disbleP2p": false, // 禁用p2p 强制中转
+    "dhcp": true, // 启用dhcp,动态获取IP
+    "devName": true, // 启用自定义网卡名
+    "devNameValue": "etgame", // 自定义网卡名
+    "enableCustomProtocol": true, // 自定义p2p时默认协议
+    "customProtocol": "tcp", // 自定义p2p时使用的协议类型
+    "enableNetCardMetric": true, // 启用自定义网卡跃点
+    "netCardMetricValue": 1, // 网卡跃点
+    "enablePreventSleep": false, // 启用防止睡眠
+    "compression": "none", // 压缩算法
+    "enableKcpProxy": true, // 启用kcp代理
+    "disableKcpInput": false //     禁用kcp输入
+}

src-tauri/src/lib.rs

@@ -1,20 +1,126 @@
+use planif::enums::TaskCreationFlags;
+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::sync::{
+use std::ptr;
-    atomic::{AtomicBool, Ordering},
+use std::sync::mpsc;
-    mpsc, Arc,
-};
 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)]
@@ -39,11 +145,11 @@ pub async fn fetch_releases() -> Result<Vec<Release>, Error> {
     let client = Client::new();
     // 构建请求的URL
     let url = format!("https://api.github.com/repos/easytier/easytier/releases",);
-
+    let user_agent = generate_random_user_agent();
     // 发送HTTP GET请求
     let response = client
         .get(&url)
-        .header("User-Agent", "Tauri-fetch")
+        .header("User-Agent", user_agent)
         .send()
         .await?;
     // 反序列化响应体为Release列表
@@ -51,23 +157,50 @@ pub async fn fetch_releases() -> Result<Vec<Release>, Error> {
 }
 
 #[tauri::command(rename_all = "snake_case")]
-fn get_core_version() -> String {
+async fn fetch_game_releases() -> [String; 2] {
-    match Command::new("easytier-core.exe")
+    // 创建HTTP客户端
-        .arg("--version")
+    let client = Client::new();
-        .creation_flags(0x08000000)
+    // 构建请求的URL
-        .output()
+    let url = format!("https://api.github.com/repos/Easytier/EasytierGame/releases",);
+    let user_agent = generate_random_user_agent();
+    // 发送HTTP GET请求
+    if let Ok(response) = client
+        .get(&url)
+        .header("User-Agent", user_agent)
+        .send()
+        .await
     {
-        Ok(output) => {
+        // 反序列化响应体为Release列表
-            let output_str = String::from_utf8_lossy(&output.stdout);
+        match response.json::<Vec<Release>>().await {
-            return output_str.trim().to_string();
+            Ok(releases) => {
+                if releases.len() <= 0 {
+                    return [String::from(""), String::from("")];
+                }
+                let release = releases.first().unwrap();
+                let tag_name = release.tag_name.as_str();
+                let browser_download_url = release
+                    .assets
+                    .first()
+                    .unwrap()
+                    .browser_download_url
+                    .as_str();
+                [String::from(tag_name), String::from(browser_download_url)]
+            }
+            Err(_e) => {
+                log::error!("game release {}", _e.to_string());
+                [String::from(""), String::from("")]
+            }
         }
-        Err(_e) => return "".to_string(),
+    } else {
+        log::error!("failed to get game release");
+        [String::from(""), String::from("")]
     }
 }
 
 #[tauri::command(rename_all = "snake_case")]
-fn get_cli_version() -> String {
+fn get_core_version() -> String {
-    match Command::new("easytier-cli.exe")
+    let core_path = get_tool_exe_path("\\easytier\\easytier-core.exe");
+    match Command::new(&core_path)
         .arg("--version")
         .creation_flags(0x08000000)
         .output()
@@ -76,10 +209,37 @@ fn get_cli_version() -> String {
             let output_str = String::from_utf8_lossy(&output.stdout);
             return output_str.trim().to_string();
         }
-        Err(_e) => return "".to_string(),
+        Err(_e) => {
+            log::error!("{}", _e.to_string());
+            return "".to_string();
+        }
     }
 }
 
+// #[tauri::command(rename_all = "snake_case")]
+// #[warn(dead_code)]
+// fn get_cli_version() -> String {
+//     let cli_path = get_tool_exe_path("\\easytier\\easytier-cli.exe");
+//     match Command::new(&cli_path)
+//         .arg("--version")
+//         .creation_flags(0x08000000)
+//         .output()
+//     {
+//         Ok(output) => {
+//             let output_str = String::from_utf8_lossy(&output.stdout);
+//             return output_str.trim().to_string();
+//         }
+//         Err(_e) => return "".to_string(),
+//     }
+// }
+
+fn get_tool_exe_path(path: &str) -> String {
+    let cur_vec = get_exe_directory();
+    let tool_path = format!("{}{}", cur_vec[1].as_str(), path);
+    // log::error!("tool path: {}", tool_path);
+    return tool_path;
+}
+
 #[derive(Serialize, Deserialize, Debug)]
 struct RoutePeerInfo {
     peer_id: u64,
@@ -113,44 +273,116 @@ struct MyResponse {
 }
 
 #[tauri::command(rename_all = "snake_case")]
-fn get_members_by_cli() -> String {
+async fn get_members_by_cli() -> String {
-    match Command::new("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
     {
         Ok(output) => {
-            let output_str = String::from_utf8_lossy(&output.stdout);
+            if output.status.success() {
-            return output_str.trim().to_string();
+                let output_str = String::from_utf8_lossy(&output.stdout);
+                return output_str.trim().to_string();
+            } else {
+                let output_str = String::from_utf8_lossy(&output.stderr);
+                log::error!("{}", output_str.trim().to_string());
+                return "_EasytierGameCliFailedToConnect_".to_string();
+            }
+        }
+        Err(_e) => {
+            log::error!("get member list error");
+            return "".to_string();
         }
-        Err(_e) => return _e.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 target = format!("https://ghp.ci/{}", download_url);
+    let cli_path = get_tool_exe_path("\\easytier\\easytier-cli.exe");
-    let response = reqwest::get(target)
+    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() {
+        unzip(cache_file_name_path);
+        return;
+    }
+
+    let target = format!("{}", download_url);
+    let mut response = reqwest::get(target)
         .await
         .expect("error to download easytier url");
-    let file_path = format!("./{}", file_name);
+    let easytier_path = get_tool_exe_path("\\easytier");
+    let file_path = format!("{}\\{}", easytier_path, file_name);
+    // println!("download easytier to {}", file_path);
+
+    let easytier_dir = path::Path::new(&easytier_path);
+    if !easytier_dir.exists() {
+        fs::create_dir_all(&easytier_dir).unwrap();
+    }
+
     let path = path::Path::new(&file_path);
+    println!("download easytier to {}", path.display());
 
     let mut file = match File::create(&path) {
         Err(why) => panic!("couldn't create {}", why),
         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");
-    unzip(path);
+            },Err(why) => {
-    match fs::remove_file(path) {
+                log::error!("error to write file: {}", why);
-        Ok(_) => println!("删除zip文件成功"),
+                app_handle.emit("download_core_progress_error", why.to_string()).expect("error to emit download_core_progress_error");
-        Err(_) => println!("删除zip文件失败"),
+                return
+            }
+        };
+        
     }
+    println!("下载完成");
+    unzip(path);
+
+    let cache_dir_path = path::Path::new(&cache_dir_path);
+    if !cache_dir_path.exists() {
+        fs::create_dir_all(&cache_dir_path).unwrap();
+    }
+    match fs::rename(path, cache_file_name) {
+        Ok(_) => println!("保存zip文件至easytier/cache成功"),
+        Err(_) => log::error!("保存zip文件失败"),
+    }
+    // match fs::remove_file(path) {
+    //     Ok(_) => println!("删除zip文件成功"),
+    //     Err(_) => log::error!("删除zip文件失败"),
+    // }
 }
 
 fn unzip(fname: &path::Path) {
@@ -183,7 +415,14 @@ fn unzip(fname: &path::Path) {
         //         fs::create_dir_all(p).unwrap();
         //     }
         // }
-        let out_file_path = path::Path::new("./").join(outpath.file_name().clone().unwrap());
+        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();
+        // }
+
+        // let out_file_path = path::Path::new("./").join(outpath.file_name().clone().unwrap());
+        let out_file_path = easytier_dir.join(outpath.file_name().clone().unwrap());
         println!("outFilePath: {}", out_file_path.display());
         let mut outfile = fs::File::create(&out_file_path).unwrap();
         std::io::copy(&mut file, &mut outfile).unwrap();
@@ -191,24 +430,26 @@ fn unzip(fname: &path::Path) {
 }
 
 #[tauri::command(rename_all = "snake_case")]
-fn run_command(
+fn run_command(app_handle: tauri::AppHandle, args: Vec<String>, is_server: Option<bool>) {
-    app_handle: tauri::AppHandle,
+    let is_server = is_server.unwrap_or(false);
-    args: Vec<String>,
-    stop_signal: tauri::State<Arc<AtomicBool>>,
-) {
-    // if !path::Path::new("easytier-core.exe").exists() {
-    //     app_handle.emit("command-output", "easytier-core.exe 不存在");
-    //     return
-    // }
     let (tx, rx) = mpsc::channel();
-    stop_signal.store(false, Ordering::Relaxed);
+
     let app_handle1 = app_handle.clone();
     let app_handle2 = app_handle.clone();
-    let stop_signal1 = Arc::clone(&stop_signal);
+
-    let stop_signal2 = Arc::clone(&stop_signal);
     let args2 = args.clone();
+    let mut thread_id_str = "thread-id";
+    if is_server {
+        thread_id_str = "server-thread-id";
+    }
+    let mut command_output_str = "command-output";
+    if is_server {
+        command_output_str = "server-command-output";
+    }
     thread::spawn(move || {
-        let mut child = Command::new("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)
             .creation_flags(0x08000000)
             .stdout(Stdio::piped())
@@ -217,36 +458,36 @@ fn run_command(
 
         println!("child id: {}", child.id());
         app_handle1
-            .emit("thread-id", child.id())
+            .emit(thread_id_str, child.id())
             .expect("failed to emit id event");
         app_handle1
-            .emit("command-output", args2.join(" "))
+            .emit(command_output_str, args2.join(" "))
             .expect("error output args");
         let stdout = child.stdout.take().expect("failed to capture stdout");
         let reader = BufReader::new(stdout);
 
         for line in reader.lines() {
             match line {
-                Ok(line) => {
+                Ok(line) => match tx.send(line) {
-                    tx.send(line).expect("failed to send line");
+                    Ok(_) => {}
-                }
+                    Err(e) => {
+                        log::error!("error sending line: {}", e);
+                        break;
+                    }
+                },
                 Err(e) => {
-                    eprintln!("error reading line: {}", e);
+                    log::error!("error reading line: {}", e);
                     break;
                 }
             }
         }
-        stop_signal1.store(true, Ordering::Relaxed);
         println!("end");
     });
 
     thread::spawn(move || {
         while let Ok(line) = rx.recv() {
-            if stop_signal2.load(Ordering::Relaxed) {
-                break;
-            }
             app_handle2
-                .emit("command-output", line)
+                .emit(command_output_str, line)
                 .expect("failed to emit event");
         }
     });
@@ -292,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();
-        }
     }
 }
 
@@ -332,36 +570,201 @@ fn search_pid_by_pname(target_process_name: String) -> u32 {
     return 0;
 }
 
-pub const AUTOSTART_ARG: &str = "--autostart";
+#[tauri::command]
+fn get_exe_directory() -> Vec<String> {
+    let mut ret_vec: Vec<String> = Vec::new();
+    match std::env::current_exe() {
+        Ok(exe_path) => {
+            // println!("Path of this executable is: {}", exe_path.display());
+            ret_vec.push(exe_path.display().to_string());
+            ret_vec.push(exe_path.parent().unwrap().display().to_string());
+            return ret_vec;
+        }
+        Err(e) => {
+            println!("failed to get current exe path: {e}");
+            ret_vec.push("".to_string());
+            ret_vec.push("".to_string());
+            return ret_vec;
+        }
+    };
+}
+
+#[tauri::command]
+fn spawn_autostart(enabled: bool) {
+    let (tx, rx) = mpsc::channel();
+
+    thread::spawn(move || match autostart(enabled) {
+        Ok(_) => {
+            let _ = tx.send(true);
+        }
+        Err(e) => {
+            log::error!("Error: {}", e);
+            let _ = tx.send(false);
+        }
+    });
+
+    match rx.recv() {
+        Ok(_) => {
+            // println!("autostart enabled: {}", enabled);
+        }
+        Err(_e) => {}
+    }
+}
+
+fn autostart_enabled() -> Result<bool, Box<dyn std::error::Error>> {
+    unsafe {
+        let task_service: ITaskService = CoCreateInstance(&TaskScheduler, None, CLSCTX_ALL)?;
+        task_service.Connect(
+            &VARIANT::default(),
+            &VARIANT::default(),
+            &VARIANT::default(),
+            &VARIANT::default(),
+        )?;
+
+        // 指定要删除的任务文件夹路径
+        let folder_path = BSTR::from("\\easytierGame");
+        // let root = BSTR::from("\\");
+        let task_name = BSTR::from("auto start");
+        let mut penabled = VARIANT_BOOL::from(false);
+        let bool_ptr: *mut VARIANT_BOOL = &mut penabled;
+
+        // 获取任务文件夹F
+        let task_folder: ITaskFolder = task_service.GetFolder(&folder_path)?;
+        let task = task_folder.GetTask(&task_name)?;
+        task.Definition()?
+            .Triggers()?
+            .get_Item(1)?
+            .Enabled(bool_ptr)?;
+        // 释放 COM 库
+        CoUninitialize();
+        // return penabled.as_bool();
+        Ok(penabled.as_bool())
+    }
+}
+
+#[tauri::command]
+fn autostart_is_enabled() -> bool {
+    match autostart_enabled() {
+        Ok(enabled) => {
+            println!("autostart enabled: {}", enabled);
+            return enabled;
+        }
+        Err(e) => {
+            log::error!("autostart enabled: false -> {}", e);
+            return false;
+        }
+    }
+}
+
+// pub const AUTOSTART_ARG: &str = "--autostart";
+pub const TASKAUTOSTART_ARG: &str = "--task-auto-start";
+fn autostart(enabled: bool) -> std::result::Result<(), Box<dyn std::error::Error>> {
+    if !enabled {
+        unsafe {
+            let task_service: ITaskService = CoCreateInstance(&TaskScheduler, None, CLSCTX_ALL)?;
+            task_service.Connect(
+                &VARIANT::default(),
+                &VARIANT::default(),
+                &VARIANT::default(),
+                &VARIANT::default(),
+            )?;
+
+            // 指定要删除的任务文件夹路径
+            let folder_path = BSTR::from("\\easytierGame");
+            let root = BSTR::from("\\");
+            let task_name = BSTR::from("auto start");
+
+            // 获取任务文件夹
+            let task_folder: ITaskFolder = task_service.GetFolder(&folder_path)?;
+            task_folder.DeleteTask(&task_name, 0)?;
+            println!("Task AutoStart Task deleted successfully.");
+
+            let task_folder: ITaskFolder = task_service.GetFolder(&root)?;
+
+            // 删除任务文件夹
+            task_folder.DeleteFolder(&folder_path, 0)?;
+
+            println!("Task folder easytierGame deleted successfully.");
+
+            // 释放 COM 库
+            CoUninitialize();
+        }
+    } else {
+        let ts = planIfTaskScheduler::new()?;
+        let com = ts.get_com();
+        let sb = ScheduleBuilder::new(&com).unwrap();
+
+        let exe = std::env::current_exe()?;
+        let exe = exe.to_str().unwrap();
+
+        let settings = PrincipalSettings {
+            display_name: "".to_string(),
+            group_id: None,
+            id: "".to_string(),
+            logon_type: LogonType::InteractiveToken,
+            run_level: RunLevel::Highest,
+            user_id: Some(whoami::username()),
+        };
+        sb.create_logon()
+            .author("heixiansen")?
+            .trigger("trigger", enabled)?
+            .action(Action::new("auto start", exe, "", &TASKAUTOSTART_ARG))?
+            .in_folder("easytierGame")?
+            .principal(settings)?
+            .delay(Duration {
+                seconds: Some(6),
+                ..Default::default()
+            })?
+            .build()?
+            .register("auto start", TaskCreationFlags::CreateOrUpdate as i32)?;
+    }
+    Ok(())
+}
 
 #[cfg_attr(mobile, tauri::mobile_entry_point)]
 pub fn run() {
-    let stop_signal = Arc::new(AtomicBool::new(false)); // 创建一个原子布尔值，用于控制命令的停止
+    // 获取命令行参数
-    let stop_signal_clone = Arc::clone(&stop_signal); // 创建一个原子布尔值的克隆，用于传递给命令
+    let _args: Vec<String> = std::env::args().collect();
+
     let context = tauri::generate_context!();
     tauri::Builder::default()
-        .plugin(tauri_plugin_autostart::init(
+        .plugin(tauri_plugin_dialog::init())
-            MacosLauncher::LaunchAgent,
+        .plugin(tauri_plugin_cli::init())
-            Some(vec![AUTOSTART_ARG]),
+        .plugin(
-        ))
+            tauri_plugin_window_state::Builder::new()
+                .with_state_flags(tauri_plugin_window_state::StateFlags::SIZE)
+                .build(),
+        )
+        .plugin(tauri_plugin_clipboard_manager::init())
+        .plugin(tauri_plugin_fs::init())
         .plugin(tauri_plugin_shell::init())
         .plugin(tauri_plugin_single_instance::init(|app, _args, _cwd| {
             let _ = app
                 .get_webview_window("main")
                 .expect("no main window")
-                .set_focus();
+                .set_focus()
+                .expect("failed to set focus");
         }))
-        .setup(|app| {
+        .setup(move |app| {
-            if cfg!(debug_assertions) {
+            // let args = args.clone();
-                app.handle().plugin(
+            // if cfg!(debug_assertions) {
-                    tauri_plugin_log::Builder::default()
+            let log_path = get_tool_exe_path("\\easytier\\guiLogs");
-                        .level(log::LevelFilter::Info)
+            app.handle().plugin(
-                        .build(),
+                tauri_plugin_log::Builder::default()
-                )?;
+                    .target(tauri_plugin_log::Target::new(
-            }
+                        tauri_plugin_log::TargetKind::Folder {
+                            path: std::path::PathBuf::from(log_path),
+                            file_name: None,
+                        },
+                    ))
+                    .max_file_size(50_000 /* bytes */)
+                    .level(log::LevelFilter::Error)
+                    .build(),
+            )?;
+            // }
             #[cfg(not(target_os = "android"))]
             let _tray_menu = TrayIconBuilder::with_id("main")
-                .menu_on_left_click(false)
+                .show_menu_on_left_click(false)
                 .on_tray_icon_event(|tray, event| {
                     if let TrayIconEvent::Click {
                         button: MouseButton::Left,
@@ -378,18 +781,32 @@ pub fn run() {
                 ))?)
                 .icon_as_template(false)
                 .build(app)?;
+
+            // 开机自启隐藏到托盘或者显示主窗口
+            // if !args.contains(&String::from(TASKAUTOSTART_ARG)) {
+            //     let main_window = app.get_webview_window("main").unwrap();
+            //     main_window.show().expect("failed to show window");
+            //     main_window.set_focus().expect("failed to set focus");
+            // }
+
             Ok(())
         })
-        .manage(stop_signal_clone)
         .invoke_handler(tauri::generate_handler![
             run_command,
             stop_command,
             get_core_version,
             fetch_easytier_list,
+            fetch_game_releases,
             download_easytier_zip,
-            get_cli_version,
             get_members_by_cli,
-            search_pid_by_pname
+            get_route_by_cli,
+            search_pid_by_pname,
+            get_exe_directory,
+            spawn_autostart,
+            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,39 +1,74 @@
 {
 	"$schema": "../node_modules/@tauri-apps/cli/config.schema.json",
 	"productName": "easytier-game",
-	"version": "1.0.7",
+	"version": "1.4.2",
 	"identifier": "com.tauri.easytier-game",
 
 	"build": {
 		"frontendDist": "../dist",
 		"devUrl": "http://localhost:5000",
-		"beforeBuildCommand": "pnpm build",
 		"beforeDevCommand": "pnpm dev"
 	},
 	"app": {
 		"windows": [
 			{
-				"title": "easytier-game",
+				"title": "easytier-game 1.4.2",
-				"width": 331,
+				"label": "main",
+				"minWidth": 340,
+				"width": 340,
 				"height": 305,
-				"resizable": false,
+				"minHeight": 305,
+				"maxHeight": 305,
+				"maxWidth": 360,
+				"resizable": true,
 				"fullscreen": false,
 				"decorations": true,
 				"center": true,
+				"visible": false,
 				"maximizable": false,
 				"transparent": false
 			}
 		],
 		"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",
-		"externalBin": ["WinIPBroadcast"],
+		"resources": [
-		"resources": ["icons/icon-inactive.ico", "icons/icon.ico", "easytier-cli.exe", "easytier-core.exe", "Packet.dll", "wintun.dll"],
+			"easytier/config/",
+			"easytier/icons/",
+			"easytier/config_template.json",
+			"easytier/tool/WinIPBroadcast.exe",
+			"easytier/tool/ForceBindIP.exe",
+			"easytier/tool/ForceBindIP64.exe",
+			"easytier/tool/BindIP.dll",
+			"easytier/tool/BindIP64.dll",
+			"easytier/tool/MicrosoftEdgeWebview2Setup.exe",
+			"easytier/easytier-cli.exe",
+			"easytier/easytier-core.exe",
+			"easytier/Packet.dll",
+			"easytier/wintun.dll",
+			"easytier/clear_local_data.bat",
+			"帮助.txt",
+			"uninstall.exe"
+		],
 		"windows": {
 			"webviewInstallMode": {
 				"type": "embedBootstrapper"

src-tauri/帮助.txt

@@ -0,0 +1,26 @@
+[如果界面无法打开]
+
+1. 如果您已经启动easytier-game.exe，那它可能会在后台运行，打开任务管理器关闭easytier-game.exe
+
+2. 使用easytier-game安装目录下的 easytier/tool/MicrosoftEdgeWebview2Setup.exe 安装webview2
+
+3. 再次启用easytier-game.exe
+
+
+[如果想彻底删除easytierGame]
+--
+1. 关闭easytierGame
+
+2. 运行easytier-game安装目录下的 easytier/clear_local_data.bat (需要管理员权限) 输入y确认，清除本地存储数据
+
+3. 删除easytierGame文件夹
+--
+或者直接使用uninstall.exe
+
+
+[没有服务器，怎么自建服务]
+1. 点击 启动联机 按钮旁边的箭头 选择自建服务 设置好端口号后 点击启动服务器
+
+2. 搜索一下 openFrp mossFrp sakurafrp 等 将你的本地服务通过它（们）代理到公网
+
+3. 将代理之后的地址发给别人，他们就可以通过这个加入你的服务了

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: "",
@@ -11,7 +11,13 @@ export default defineStore("main", {
 				ipv4: "",
 				proxyNetworks: "", // 子网代理
 				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: false, // 是否禁用加密
 				multiThread: false, //使用多线程
@@ -20,27 +26,65 @@ export default defineStore("main", {
 				latencyfirst: false, // 是否优先延迟
 				useSmoltcp: false, // 是否为子网代理启用smoltcp堆栈
 				disableUdpHolePunching: false, // 是否禁用UDP打洞
-				relayAllPeerrpc: false, // 是否启用所有对等RPC
+				relayAllPeerrpc: true, // 是否启用所有对等RPC
 				disbleP2p: false, // 是否使用P2P
 				dhcp: true, // 是否使用DHCP
+				saveErrorLog: true, // 是否保存错误日志
+				logLevel: "error", //日志等级
+				devName: true, //自定义网卡名
+				devNameValue: "etgame", //自定义网卡名
+				enableCustomProtocol: true, //自定义默认协议
+				customProtocol: "tcp", //自定义默认协议
+				enableNetCardMetric: true, //启用网卡自定义跃点
+				netCardMetricValue: 1, //自定义网卡跃点值
+				enablePreventSleep: false, //组织系统休眠
+				compression: "none", //加密算法
+				enableKcpProxy: true, //启用kcp代理  默认开启
+				disableKcpInput: false //禁用kcp输入
+			},
+			serverConfig: {
+				enableWhiteList: true, // 是否启用白名单
+				relayAllPeerrpc: false, // 是否启用所有对等RPC
+				serverWhiteList: "", // 服务器流量转发白名单
+				// enableListener: true, // 是否启用监听
+				autoStart: false, //随软件自启
+				port: "11010" // 服务器端口
 			},
 			cidrEnable: false,
-			basePeers: ["public.easytier.top:11010"],
+			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://ghfast.top/",
+
+			// forceBindIp配置
+			forceBindIpBit: "64",
+			delayInjectDll: false,
+			forceBindInput: "",
+			forceBindFile: "",
+
+			winipBcPid: 0,
+			winipBcStart: false,
+			latestTagName: "",
+
+			gameList: [] as Array<{ name: string; exePath: string; id: string; coverImg?: string; showImg: string }> // 游戏列表
 		};
 	},
 	persist: {
-		paths: [
+		// 防止持久化保存 用户使用config.json输入的无用的字段
-			"basePeers",
+		pick: [
-			"cidrEnable",
+			"config.protocol",
-			"config.proxyNetworks",
 			"config.serverUrl",
 			"config.networkName",
-			"config.protocol",
 			"config.networkPassword",
-			"config.disbleP2p",
+			"config.hostname",
+			"config.ipv4",
+			"config.proxyNetworks",
 			"config.autoStart",
+			"config.connectAfterStart",
 			"config.disableIpv6",
-			"config.disbleListenner",
 			"config.disableEncryption",
 			"config.multiThread",
 			"config.enablExitNode",
@@ -49,8 +93,57 @@ export default defineStore("main", {
 			"config.useSmoltcp",
 			"config.disableUdpHolePunching",
 			"config.relayAllPeerrpc",
-			"config.hostname",
+			"config.disbleP2p",
 			"config.dhcp",
-		],
+			"config.saveErrorLog",
-	},
+			"config.logLevel",
+			"config.devName",
+			"config.devNameValue",
+			"config.enableNetCardMetric",
+			"config.netCardMetricValue",
+			"config.port",
+
+			"config.disbleListenner",
+			"config.enableCustomListener",
+			"config.customListenerData",
+			"config.enableCustomListenerV6",
+			"config.customListenerV6Data",
+
+			"config.enableCustomProtocol",
+			"config.customProtocol",
+			"config.enablePreventSleep",
+			"config.compression",
+
+			"config.enableKcpProxy",
+			"config.disableKcpInput",
+
+			"serverConfig.autoStart",
+			// 'serverConfig.enableListener',
+			"serverConfig.enableWhiteList",
+			"serverConfig.relayAllPeerrpc",
+			"serverConfig.serverWhiteList",
+			"serverConfig.port",
+
+			"cidrEnable",
+			"basePeers",
+			"theme",
+			"configStartEnable",
+			"configPath",
+			"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: {}

tsconfig.json

@@ -6,6 +6,8 @@
 		"components/**/*.ts",
 		"components/**/*.js",
 		"components/**/*.vue",
+		"composables/**/*.ts",
+		"app.vue",
 		"pages/**/*.ts",
 		"pages/**/*.js",
 		"pages/**/*.vue",
@@ -27,16 +29,16 @@
 	"compilerOptions": {
 		"target": "ESNext",
 		"module": "ESNext",
+		"moduleResolution": "Node",
 		// 	"types": ["element-plus/global"]
 		"resolveJsonModule": true,
 		// 从 Vue 3.4 开始，Vue 不再隐式注册全局 JSX 命名空间。要指示 TypeScript 使用 Vue 的 JSX 类型定义，请确保在你的 tsconfig.json 中包含以下内容
 		"jsx": "preserve",
 		"jsxImportSource": "vue",
-		"types": ["@pinia/nuxt", "vite/client", "element-plus/global"],
+		"types": ["@pinia/nuxt", "vite/client", "element-plus/global", "pinia-plugin-persistedstate"],
 		"allowJs": true, // 允许编译器编译JS，JSX文件
-		"checkJs": true, // 允许在JS文件中报错，通常与allowJS一起使用
+		"checkJs": false, // 允许在JS文件中报错，通常与allowJS一起使用
 		"esModuleInterop": true, // 允许export=导出，由import from 导入
-
 		"lib": ["DOM", "ESNext"],
 		"allowSyntheticDefaultImports": true
 	}

typings/index.d.ts

@@ -1 +1,12 @@
+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 {
+	readonly env: ImportMetaEnv;
+}

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: "确定",
@@ -29,6 +29,8 @@ export const ElConfirmDanger = (
 	}
 	return ATJ(
 		ElMessageBox.confirm(message, title, {
+			closeOnClickModal: false, // 点击遮罩层不关闭弹窗
+			closeOnPressEscape: false, // 按下Esc键不关闭弹窗
 			cancelButtonText,
 			confirmButtonText,
 			confirmButtonClass: "el-button--danger"
@@ -38,7 +40,7 @@ export const ElConfirmDanger = (
 
 export const ElConfirmSucces = (
 	content: string,
-	title: string,
+	title: string = "提示",
 	opt: Opt = {
 		action: "",
 		confirmButtonText: "确定",
@@ -63,6 +65,8 @@ export const ElConfirmSucces = (
 	}
 	return ATJ(
 		ElMessageBox.confirm(message, title, {
+			closeOnClickModal: false, // 点击遮罩层不关闭弹窗
+			closeOnPressEscape: false, // 按下Esc键不关闭弹窗
 			cancelButtonText,
 			confirmButtonText,
 			confirmButtonClass: "el-button--success"
@@ -72,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 = [];
@@ -97,6 +102,9 @@ export const ElConfirmPrimary = (
 	}
 	return ATJ(
 		ElMessageBox.confirm(message, title, {
+			closeOnClickModal: false, // 点击遮罩层不关闭弹窗
+			closeOnPressEscape: false, // 按下Esc键不关闭弹窗
+			showCancelButton,
 			cancelButtonText,
 			confirmButtonText,
 			confirmButtonClass: "el-button--primary"

utils/index.ts

@@ -1,19 +1,9 @@
-
+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";
-import Clipboard from "vue-clipboard3";
-
 export const ENV = import.meta.env;
 
-export const clipBoardCopy = async (text: string) => {
-	const { toClipboard } = Clipboard();
-	try {
-		await toClipboard(text);
-		ElMessage.success("复制成功");
-	} catch (e) {
-		ElMessage.error("复制失败");
-	}
-};
-
 //防抖
 export const bounce = (time = 3000) => {
 	let bounceTimer: NodeJS.Timeout | null = null;
@@ -77,7 +67,97 @@ export const ATJ = (promise: Promise<any>, errorExt: string | undefined = undefi
 		});
 };
 
-export const openBrowser = (key: string) => {
+const _supportProtocols = ["tcp", "udp", "ws", "wss", "quic"];
-	// logger.info(`${import.meta.env.VITE_BROWSER_JOB_URL}${key}`)
+
-	// _launcherApi.openBrowser(`${import.meta.env.VITE_BROWSER_JOB_URL}${key}`);
+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");
+
+	// 提取表头（keys）
+	const headers = lines[1]
+		.split("│")
+		.slice(1, -1)
+		.map(h => h.trim());
+
+	// 初始化结果数组
+	const result: any[] = [];
+
+	// 遍历数据行
+	for (let i = 3; i < lines.length - 1; i += 2) {
+		if (lines[i].trim() === "") continue; // 跳过空行
+
+		// 分割每一行的数据
+		const values = lines[i]
+			.split("│")
+			.slice(1, -1)
+			.map(v => v.trim());
+
+		// 创建对象并添加到结果数组
+		const obj: any = {};
+		headers.forEach((header, index) => {
+			obj[header] = values[index] === "-" || values[index] === "" ? null : values[index];
+		});
+
+		// 每行数据都作为一个新对象添加到结果数组中
+		result.push(obj);
+	}
+
+	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");
+};
+
+export function isValidIP(ip: string) {
+	const ipv4Pattern =
+		/^(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)$/;
+	const ipv6Pattern = /^(?:[A-Fa-f0-9]{1,4}:){7}[A-Fa-f0-9]{1,4}$/;
+	return ipv4Pattern.test(ip) || ipv6Pattern.test(ip);
+}
+
+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

@@ -0,0 +1,53 @@
+import useMainStore from "@/stores/index";
+import { open, Command } from "@tauri-apps/plugin-shell";
+import { invoke } from "@tauri-apps/api/core";
+
+const getExeAbsPath = async () => {
+	const aExePath = (await invoke("get_exe_directory")) as [string, string];
+	return aExePath;
+};
+
+const checkServerOnWindows = async () => {
+	try {
+		const serverStatus = await Command.create("nssm", ["status", import.meta.env.VITE_AUTO_START_SERVICE_NAME]).execute();
+		if (serverStatus.stderr.includes("Can't open service")) {
+			return false;
+		}
+		return true;
+	} catch (err) {
+		return false;
+	}
+};
+
+const handleAutoStartByNssm = async () => {
+    const config = useMainStore().config;
+	const [exeAbsPath, parentDir] = await getExeAbsPath();
+	const isExist = await checkServerOnWindows();
+	if (isExist) {
+		const outputStop = await Command.create("nssm", ["stop", import.meta.env.VITE_AUTO_START_SERVICE_NAME, "confirm"]).execute();
+		console.log({ outputStop });
+		const outputRemove = await Command.create("nssm", ["remove", import.meta.env.VITE_AUTO_START_SERVICE_NAME, "confirm"]).execute();
+		console.log({ outputRemove });
+	}
+	if (exeAbsPath) {
+		const output = await Command.create("nssm", ["install", import.meta.env.VITE_AUTO_START_SERVICE_NAME, exeAbsPath]).execute();
+		console.log(output);
+		if (output.stdout && output.stdout.includes("installed successfully")) {
+			const outputAppDirectory = await Command.create("nssm", [
+				"set",
+				import.meta.env.VITE_AUTO_START_SERVICE_NAME,
+				"AppDirectory",
+				parentDir
+			]).execute();
+			console.log({ outputAppDirectory });
+			const outputStart = await Command.create("nssm", [
+				"set",
+				import.meta.env.VITE_AUTO_START_SERVICE_NAME,
+				"Start",
+				"SERVICE_AUTO_START"
+			]).execute();
+			console.log({ outputStart });
+			config.autoStart = true;
+		}
+	}
+};

zip.js

@@ -0,0 +1,68 @@
+/**
+ * 生成 release 发布包 zip 文件
+ */
+const pkg = require("./package.json");
+const isWin7 = process.argv[2] == 'win7';
+const releaseDir = isWin7 ? "./src-tauri/target/x86_64-win7-windows-msvc/release" : "./src-tauri/target/release";
+const fileName = isWin7 ?  `easytier-game_windows7_fix_${pkg.version}.zip` : `easytier-game_windows_x86_64_${pkg.version}.zip`; // 发布包格式
+const releaseDirEasytier = `${releaseDir}/easytier/`;
+const releaseExe = `${releaseDir}/easytier-game.exe`;
+const releaseHelp = `${releaseDir}/帮助.txt`;
+const releaseUninstall = `${releaseDir}/uninstall.exe`;
+const deleteEasytierFiles = ["logs/", "guiLogs/", "cache/"];
+const releaseZipDir = "./release";
+const releaseZip = `${releaseZipDir}/${fileName}`;
+
+const fs = require("fs");
+const path = require("path");
+const archiver = require("archiver");
+
+const output = fs.createWriteStream(path.join(__dirname, releaseZip));
+const archive = archiver("zip", {
+	zlib: { level: 8 } // Sets the compression level.
+});
+
+// listen for all archive data to be written
+// 'close' event is fired only when a file descriptor is involved
+output.on("close", function () {
+	console.log(archive.pointer() + " total bytes");
+	console.log(`archiver has been finalized and the output ${releaseZip}`);
+});
+
+// This event is fired when the data source is drained no matter what was the data source.
+// It is not part of this library but rather from the NodeJS Stream API.
+// @see: https://nodejs.org/api/stream.html#stream_event_end
+output.on("end", function () {
+	console.log("Data has been drained");
+});
+
+// good practice to catch warnings (ie stat failures and other non-blocking errors)
+archive.on("warning", function (err) {
+	if (err.code === "ENOENT") {
+		// log warning
+	} else {
+		// throw error
+		throw err;
+	}
+});
+
+archive.on("error", function (err) {
+	throw err;
+});
+
+for (const f of deleteEasytierFiles) {
+	fs.rmSync(path.join(__dirname, releaseDirEasytier + f), { recursive: true, force: true });
+}
+const r = path.join(__dirname, releaseZipDir);
+if (!fs.existsSync(r)) {
+	fs.mkdirSync(r);
+}
+
+// pipe archive data to the file
+archive.pipe(output);
+archive
+	.append(fs.createReadStream(path.join(__dirname, releaseExe)), { name: "easytier-game.exe" })
+	.append(fs.createReadStream(path.join(__dirname, releaseHelp)), { name: "帮助.txt" })
+	.append(fs.createReadStream(path.join(__dirname, releaseUninstall)), { name: "uninstall.exe" })
+	.directory(path.join(__dirname, releaseDirEasytier), "easytier")
+	.finalize();