1.3.1发布

+ 点击托盘只显示窗口，优化显示窗口逻辑，修复无法显示到最上层的问题
+ 防止休眠代码优化，修复防止休眠选中后没保存的问题

.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

@@ -29,6 +29,7 @@ Releases： [https://github.com/EasyTier/EasytierGame/releases](https://github.c
     ![game-step5](/assets/game-step5.png)
 
 - easytier内核升级后，可以点击内核管理按钮就可以进行内核切换和更新，但是需要出国或者github加速链接，如果无法更新，可以在群里获取
+- 1.2.6内核管理下载的内核 保存于easytier/cache目录，下次切换不用二次下载
     ![game-step6](/assets/game-step6.png)
 
 - 1.1.4更新了 配置分享功能 可以与朋友之间分享配置，方便联机
@@ -49,6 +50,12 @@ Releases： [https://github.com/EasyTier/EasytierGame/releases](https://github.c
 - 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)
+
 ## 特性
 
 - 基于easytier组网工具开发，界面清晰简单

assets/css/main.css

@@ -9,7 +9,9 @@
 		font-family: "Helvetica Neue", "Luxi Sans", "DejaVu Sans", Tahoma, "Hiragino Sans GB", STHeiti, "Microsoft YaHei";
 	}
 } */
-
+html {
+	font-family: "Helvetica Neue",Helvetica,"PingFang SC","Hiragino Sans GB","Microsoft YaHei","微软雅黑",Arial,sans-serif;
+}
 html,
 body {
 	height: 100%;
@@ -27,6 +29,9 @@ html.dark body {
 }
 
 #__easytier {
+	display: flex;
+	flex-direction: column;
+	flex-wrap: nowrap;
 	height: 100%;
 	overflow: hidden;
 	box-sizing: border-box;
@@ -36,4 +41,15 @@ html.dark body {
 .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;
 }

composables/configJson.ts

@@ -22,6 +22,10 @@ export const updateConfigJson = async (configJsonSeverUrl: Array<string> | strin
 			saveErrorLog,
 			logLevel,
 			serverUrl,
+			port,
+			enableCustomListener,
+			enablePreventSleep,
+			customListenerData,
 			...otherConfig
 		} = mainStore.config;
 		let writeServerUrl: Array<string> | string = serverUrl;

composables/netcard.ts

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

composables/server.ts

@@ -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/tray.ts

@@ -5,6 +5,9 @@ import pkg from "@/package.json";
 import { setTheme } from "~/composables/theme";
 import useMainStore from "@/stores/index";
 import { resourceDir as getResourceDir, join } from "@tauri-apps/api/path";
+import { invoke } from "@tauri-apps/api/core";
+// import { ElConfirmPrimary } from "~/utils/element";
+// import { open } from "@tauri-apps/plugin-shell";
 
 const DEFAULT_TRAY_NAME = "main";
 
@@ -13,6 +16,7 @@ async function toggleVisibility() {
 		await getCurrentWindow().hide();
 	} else {
 		await getCurrentWindow().show();
+		await getCurrentWindow().unminimize();
 		await getCurrentWindow().setFocus();
 	}
 }
@@ -140,3 +144,19 @@ export async function setTrayTooltip(tray: TrayIcon | null, tooltip?: string | n
 		await tray.setTooltip(`EasyTierGame\n${pkg.version}`);
 	}
 }
+
+
+export const checkNewVersion = async () => {
+	let [tagName, downloadUrl] = await invoke<string[]>("fetch_game_releases");
+	if(tagName && pkg.version !== tagName) {
+		return true; //有新版
+		// const [err] = await ElConfirmPrimary("有新版本是否下载?", "发现新版本", {
+		// 	confirmButtonText: "下载",
+		// 	cancelButtonText: "取消",
+		// })
+		// if(!err) {
+		// 	open(downloadUrl);
+		// }
+	}
+	return false; //没有新版
+}

composables/windows.ts

@@ -2,17 +2,22 @@ import { type UnlistenFn } from "@tauri-apps/api/event";
 import { getCurrentWindow, PhysicalPosition, type WindowOptions, Window, currentMonitor } from "@tauri-apps/api/window";
 import { WebviewWindow } from "@tauri-apps/api/webviewWindow";
 import type { WebviewLabel, WebviewOptions } from "@tauri-apps/api/webview";
+import useMainStore from "@/stores/index";
+import { onBeforeUnmount } from "vue";
+
+const _listenersMaps: { [key: string]: [UnlistenFn | null, 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 unListenlogClose: UnlistenFn | null = null;
+	const unlistenFnList: [UnlistenFn | null, UnlistenFn | null] = _listenersMaps[label] || [null, null];
-	let unlistenLogCreated: UnlistenFn | null = null;
+	let [unlistenLogCreated, unListenlogClose] = unlistenFnList;
 	let dialog = await WebviewWindow.getByLabel(label);
 	if (!dialog) {
-		let defaultOpts: {[key:string]: any, parent: Window | undefined} = {
+		let defaultOpts: { [key: string]: any; parent: Window | undefined } = {
 			parent: undefined,
 			closable: true,
 			resizable: true,
@@ -25,28 +30,31 @@ export default async (
 		const appWindow = getCurrentWindow();
 		if (appWindow) {
 			const appSize = await appWindow.outerSize();
-			// const monitor = await currentMonitor();
-			// console.error(monitor)
 			const factor = await appWindow.scaleFactor();
 			const appPosition = await appWindow.outerPosition();
-			// console.error((appPosition.x + appSize.width) / 1.25);
 			const logicalPosition = new PhysicalPosition(appPosition.x + appSize.width, appPosition.y).toLogical(factor);
 			defaultOpts.parent = appWindow;
 			// console.error(logicalPosition);
 			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.once("tauri://webview-created", async () => {
+		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) {
@@ -55,3 +63,25 @@ export default async (
 		}
 	}
 };
+
+export const dataSubscribe = async (cb?: (...args: any) => any) => {
+	if (!cb) return;
+	const mainStore = useMainStore();
+	const currentWindow = getCurrentWindow();
+	let removeSubscribe = mainStore.$subscribe(async (...args) => {
+		const emitData = await cb(args);
+		await currentWindow.emitTo({ kind: "Window", label: "main" }, "config", emitData);
+	});
+	const unlisten = currentWindow.listen<any>("global-main-store", event => {
+		removeSubscribe && removeSubscribe();
+		mainStore.$patch({ ...event.payload.store }); // 更新全局状态
+		removeSubscribe = mainStore.$subscribe(async (...args) => {
+			const emitData = await cb(args);
+			await currentWindow.emitTo({ kind: "Window", label: "main" }, "config", emitData);
+		});
+	});
+	onBeforeUnmount(async () => {
+		unlisten && (await unlisten)();
+		removeSubscribe && removeSubscribe();
+	});
+};

env/.env.dev

@@ -1,4 +1,5 @@
 VITE_CONFIG_PATH=easytier/config/
 VITE_CONFIG_FILE_NAME=easytier/config.json
 VITE_LOG_PATH=easytier/logs/
+VITE_CACHE_PATH=easytier/cache/
 VITE_AUTO_START_SERVICE_NAME=easytierGameAutoStart

env/.env.prod

@@ -1,4 +1,5 @@
 VITE_CONFIG_PATH=easytier/config/
 VITE_CONFIG_FILE_NAME=easytier/config.json
 VITE_LOG_PATH=easytier/logs/
+VITE_CACHE_PATH=easytier/cache/
 VITE_AUTO_START_SERVICE_NAME=easytierGameAutoStart

layouts/default.vue

@@ -5,7 +5,8 @@
 <script setup lang="tsx">
 	//屏蔽右键菜单
 	document.addEventListener("contextmenu", (e: MouseEvent) => {
-		if (import.meta.env.PROD) {
+		const el = (e.target as HTMLElement);
+		if (import.meta.env.PROD && !el.classList.contains("el-input__inner") && !el.classList.contains("el-textarea__inner")) { // 所有输入框不禁用右键
 			e.preventDefault();
 		}
 	});

nuxt.config.ts

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

package.json

@@ -3,36 +3,38 @@
 	"private": true,
 	"author": "leizi97",
 	"description": "A simple network initiator based on Easytier",
-	"version": "1.2.4",
+	"version": "1.3.1",
 	"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"
 	},
 	"devDependencies": {
 		"@element-plus/icons-vue": "^2.3.1",
 		"@element-plus/nuxt": "^1.1.0",
 		"@nuxtjs/tailwindcss": "^6.12.0",
-		"@pinia/nuxt": "^0.7.0",
+		"@pinia/nuxt": "0.9.0",
 		"@tauri-apps/api": "^2.1.1",
 		"@tauri-apps/cli": "^2.1.0",
-		"@tauri-apps/plugin-autostart": "~2",
 		"@tauri-apps/plugin-cli": "^2.0.0",
 		"@tauri-apps/plugin-clipboard-manager": "^2.0.0",
-		"@tauri-apps/plugin-fs": "~2",
+		"@tauri-apps/plugin-fs": "^2.2.0",
-		"@tauri-apps/plugin-http": "^2.0.1",
+		"@tauri-apps/plugin-log": "^2.2.0",
-		"@tauri-apps/plugin-log": "^2.0.0",
+		"@tauri-apps/plugin-shell": "^2.2.0",
-		"@tauri-apps/plugin-shell": "~2",
+		"@tauri-apps/plugin-window-state": "^2.2.0",
-		"@tauri-apps/plugin-window-state": "~2",
 		"@types/lodash-es": "^4.17.12",
 		"@vitejs/plugin-vue-jsx": "^4.1.0",
-		"@vueuse/core": "^11.2.0",
+		"@vueuse/core": "12.0.0",
+		"archiver": "^7.0.1",
 		"element-plus": "^2.8.7",
 		"less": "^4.2.0",
 		"lodash-es": "^4.17.21",
-		"nuxt": "^3.13.2",
+		"nuxt": "^3.14.1592",
-		"pinia": "^2.2.6",
+		"pinia": "^2.3.0",
 		"pinia-plugin-persistedstate": "^4.1.3",
 		"postcss": "^8.4.38",
+		"prettier": "^3.4.1",
+		"prettier-plugin-tailwindcss": "^0.6.9",
 		"typescript": "^5.6.3",
 		"vue-clipboard3": "^2.0.0"
 	}

pages/advance.vue

@@ -1,7 +1,29 @@
 <template>
 	<div class="h-full overflow-auto flex flex-col items-start px-[25px]">
 		<div><ElCheckbox v-model="mainStore.config.disableIpv6">不使用IPv6</ElCheckbox></div>
-		<div><ElCheckbox v-model="mainStore.config.disbleListenner">不监听任何端口，只连接到对等节点</ElCheckbox></div>
+		<div class="flex items-center gap-[15px] flex-nowrap">
+			<div class="flex items-center gap-[5px] flex-nowrap">
+				<ElCheckbox v-model="mainStore.config.enableCustonProtocol">自定义联机时使用的默认协议</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 class="flex items-center gap-[15px] flex-nowrap">
 			<ElCheckbox v-model="mainStore.config.saveErrorLog">输出日志到本地</ElCheckbox>
 			<div class="w-[140px]">
@@ -36,7 +58,72 @@
 				打开config.json目录
 			</ElButton>
 		</div>
-
+		<div><ElCheckbox v-model="mainStore.config.enablePreventSleep">防止休眠</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>
 		<ElDivider />
 		<div class="flex items-center gap-[10px]">
 			<ElCheckbox v-model="mainStore.config.devName">自定义网卡名</ElCheckbox>
@@ -76,12 +163,12 @@
 
 		<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.disableEncryption">禁用对等节点通信的加密</ElCheckbox></div>
-		<div><ElCheckbox v-model="mainStore.config.multiThread">使用多线程运行时，默认为单线程</ElCheckbox></div>
+		<div><ElCheckbox v-model="mainStore.config.multiThread">启用多线程运行</ElCheckbox></div>
 		<ElDivider />
 
 		<div><ElCheckbox v-model="mainStore.config.useSmoltcp">为子网代理启用smoltcp堆栈</ElCheckbox></div>
-		<div><ElCheckbox v-model="mainStore.config.latencyfirst">延迟优先模式，将尝试使用最低延迟路径转发流量，默认使用最短路径</ElCheckbox></div>
+		<div><ElCheckbox v-model="mainStore.config.latencyfirst">延迟优先模式，将尝试使用最低延迟路径转发流量</ElCheckbox></div>
 		<div><ElCheckbox v-model="mainStore.config.disableUdpHolePunching">禁用UDP打洞功能</ElCheckbox></div>
 		<div>
 			<ElCheckbox v-model="mainStore.config.relayAllPeerrpc">转发所有对等节点的RPC数据包，即使对等节点不在转发网络白名单内</ElCheckbox>
@@ -91,14 +178,29 @@
 <script setup lang="ts">
 	import useMainStore from "@/stores/index";
 	import { QuestionFilled } from "@element-plus/icons-vue";
-	import { getCurrentWindow } from "@tauri-apps/api/window";
 	import { resourceDir as getResourceDir, join } from "@tauri-apps/api/path";
 	import { Command } from "@tauri-apps/plugin-shell";
 	import { exists, mkdir, BaseDirectory } from "@tauri-apps/plugin-fs";
 	import { ElMessage } from "element-plus";
+	import { reactive } from "vue";
+	import { dataSubscribe } from "@/composables/windows";
+	import { supportProtocols } from "~/utils";
+
+	const protocols = supportProtocols();
+	const listenerDialogData = reactive<{ [key: string]: any }>({
+		visible: false,
+		loading: false
+	});
+
+	const handleListenerDialog = () => {
+		listenerDialogData.visible = true;
+	};
+
+	const handleFinishInputListener = async () => {
+		listenerDialogData.visible = false;
+	};
 
 	const mainStore = useMainStore();
-	const appWindow = getCurrentWindow();
 	const data = ["trace", "debug", "info", "warn", "error", "off"];
 	const openLogDir = async () => {
 		const resourceDir = await getResourceDir();
@@ -122,11 +224,11 @@
 			ElMessage.error("config.json的目录不存在");
 		}
 	};
-	mainStore.$subscribe(async (...a) => {
+
-		// console.error("subscribe", a);
+	dataSubscribe(async (...a) => {
-		await appWindow.emitTo("main", "config", { config: { ...mainStore.config }, createConfigInEasytier: mainStore.createConfigInEasytier });
+		return {
-		// if(mainStore.createConfigInEasytier) {
+			config: { ...mainStore.config },
-		// 	updateConfigJson();
+			createConfigInEasytier: mainStore.createConfigInEasytier
-		// }
+		};
 	});
 </script>

pages/cidr.vue

@@ -10,16 +10,16 @@
 				v-model="mainStore.config.proxyNetworks"
 				type="textarea"
 				:rows="30"
-				resize="none"></ElInput>
+				resize="none"
+			></ElInput>
 		</div>
 	</div>
 </template>
 <script setup lang="ts">
 	import useMainStore from "@/stores/index";
-    import { getCurrentWindow } from "@tauri-apps/api/window";
+	import { dataSubscribe } from "@/composables/windows";
 	const mainStore = useMainStore();
-	const appWindow = getCurrentWindow();
+	dataSubscribe(async (...a) => {
-	mainStore.$subscribe((...a) => {
+		return { cidrEnable: mainStore.cidrEnable, config: { ...mainStore.config } };
-		appWindow.emitTo("main", "config", { cidrEnable: mainStore.cidrEnable, config: { ...mainStore.config } });
 	});
 </script>

pages/index.vue

@@ -4,18 +4,13 @@
 		label-position="top"
 		:model="config"
 	>
-		<!-- element-loading-custom-class="config-start"
-			v-loading="mainStore.configStartEnable"
-			:element-loading-spinner="'<path />'"
-			element-loading-text="-------已经启用配置文件，界面配置不再生效-------" -->
-		<!-- <div> -->
 		<ElFormItem
 			label="服务器"
 			prop="serverUrl"
 			class="full-label"
 		>
 			<template #label>
-				<div class="flex items-center flex-nowrap gap-[0_5px]">
+				<div class="flex flex-nowrap items-center gap-[0_5px]">
 					<div>服务器</div>
 					<span>-</span>
 					<ElTag
@@ -40,29 +35,18 @@
 							</ElTag>
 						</ElTooltip>
 					</div>
-
+					<ElTooltip content="请先停止自建服务和联机后再使用，否则内核被占用的情况下，无法进行内核更换">
-					<!-- <ElPopconfirm
+						<ElButton
-						width="325"
+							class="ml-auto"
-						cancel-button-text="取消"
+							:disabled="data.isStart || listenObj.server_thread_id.value"
-						confirm-button-text="继续"
+							@click="handleCoreManagement"
-						title="内核从github下载，需要出国工具，可能下载缓慢或失败，是否继续?
+							:loading="data.update"
-						也可以从官方群里手动下载后解压到easytier-game.exe同级目录下的easytier目录里,全部覆盖即可"
+							type="primary"
-						@confirm="handleCoreManagement"
+							size="small"
-					>
+						>
-						<template #reference> -->
+							内核管理
-					<ElButton
+						</ElButton>
-						class="ml-auto"
+					</ElTooltip>
-						:disabled="data.isStart"
-						@click="handleCoreManagement"
-						:loading="data.update"
-						type="primary"
-						size="small"
-					>
-						内核管理
-						<!-- {{ data.coreVersion ? "更新内核" : "下载内核" }} -->
-					</ElButton>
-					<!-- </template>
-					</ElPopconfirm> -->
 				</div>
 			</template>
 			<ElSelect
@@ -98,11 +82,12 @@
 					:label="item"
 					:value="item"
 				>
-					<div class="flex items-center gap-[20px] overflow-hidden flex-nowrap max-w-[calc(100vw-62px)]">
+					<div class="flex max-w-[calc(100vw-62px)] flex-nowrap items-center gap-[20px] overflow-hidden">
-						<ElTooltip :content="item">
+						<ElTooltip v-if="item && item.length > 30" placement="top" :content="item || '-'">
 							<p class="truncate">{{ item }}</p>
 						</ElTooltip>
-						<div class="flex-shrink-0 ml-auto">
+						<p v-else class="truncate">{{ item }}</p>
+						<div class="ml-auto flex-shrink-0">
 							<ElButton
 								@click.stop="handleDeleteServerUrl(item)"
 								round
@@ -114,7 +99,7 @@
 				</ElOption>
 			</ElSelect>
 		</ElFormItem>
-		<div class="flex flex-wrap gap-[0_10px] items-center">
+		<div class="flex flex-wrap items-center gap-[0_10px]">
 			<div class="flex-1">
 				<ElFormItem label="网络名">
 					<template #label>
@@ -173,7 +158,7 @@
 				label="局域网IP"
 			>
 				<template #label>
-					<div class="flex items-center h-[20px]">
+					<div class="flex h-[20px] items-center">
 						虚拟网IP
 						<ElTooltip content="对应命令行参数 --ipv4">
 							<ElIcon><QuestionFilled /></ElIcon>
@@ -196,129 +181,149 @@
 				></ElInput>
 			</ElFormItem>
 		</div>
-		<!-- </div> -->
+	</ElForm>
-		<div class="flex items-start">
+	<div class="mt-auto flex items-start">
+		<div>
 			<div>
-				<div>
+				<ElDropdown
-					<ElDropdown
+					@command="handleStartCommand"
-						@command="handleStartCommand"
+					split-button
-						split-button
+					trigger="click"
-						trigger="click"
+					size="default"
-						size="default"
+					:type="!data.isStart ? 'primary' : 'danger'"
-						:type="!data.isStart ? 'primary' : 'danger'"
+					:disabled="data.startLoading || !data.coreVersion || data.update"
-						:disabled="data.startLoading || !data.coreVersion || data.update"
+					@click="handleConnection"
-						@click="handleConnection"
+				>
-					>
+					{{ !data.isStart ? "启动联机" : "停止联机" }}
-						{{ !data.isStart ? "启动联机" : "停止联机" }}
+					<template #dropdown>
-						<template #dropdown>
+						<ElDropdownMenu>
-							<ElDropdownMenu>
+							<ElDropdownItem
-								<ElDropdownItem
+								command="import_config"
-									command="import_config"
+								:icon="Link"
-									:icon="Link"
+							>
+								导入配置
+							</ElDropdownItem>
+							<ElDropdownItem
+								command="share_config"
+								:icon="Share"
+							>
+								分享联机相关配置
+							</ElDropdownItem>
+							<ElDropdownItem disabled>
+								<ElDivider class="!m-0 !h-[2px]" />
+							</ElDropdownItem>
+							<ElDropdownItem
+								:icon="SetUp"
+								command="create_server"
+							>
+								自建服务器
+								<ElTag
+									size="small"
+									class="ml-[5px]"
+									:type="listenObj.server_thread_id.value ? 'success' : 'info'"
 								>
-									导入配置
+									{{ listenObj.server_thread_id.value ? "运行中" : "未运行" }}
-								</ElDropdownItem>
+								</ElTag>
-								<ElDropdownItem
+							</ElDropdownItem>
-									command="share_config"
+							<ElDropdownItem
-									:icon="Share"
+								:icon="Tools"
-								>
+								command="toml"
-									分享配置
+								:disabled="data.isStart"
-								</ElDropdownItem>
+							>
-								<ElDropdownItem
+								使用外部配置文件
-									:icon="Tools"
+							</ElDropdownItem>
-									command="toml"
+						</ElDropdownMenu>
-									:disabled="data.isStart"
+					</template>
-								>
+				</ElDropdown>
-									使用外部配置文件
-								</ElDropdownItem>
-							</ElDropdownMenu>
-						</template>
-					</ElDropdown>
-				</div>
-				<div class="mt-[6px] pl-[2px]">
-					<ElTooltip
-						placement="left"
-						content="日志"
-					>
-						<ElButton
-							:type="!data.logVisible ? 'info' : 'warning'"
-							@click="handleShowLogDialog"
-							:icon="List"
-							size="small"
-							plain
-						></ElButton>
-					</ElTooltip>
-					<ElTooltip
-						placement="left"
-						content="成员"
-					>
-						<ElButton
-							@click="handleShowMemberDialog"
-							:icon="UserFilled"
-							plain
-							type="success"
-							size="small"
-						></ElButton>
-					</ElTooltip>
-				</div>
 			</div>
-			<div class="ml-auto">
+			<div class="mt-[6px] pl-[2px]">
-				<ElCheckbox
-					v-model="config.disbleP2p"
-					size="small"
-				>
-					强制中转
-				</ElCheckbox>
 				<ElTooltip
-					placement="top-start"
+					placement="left"
-					content="自启后隐藏于托盘，不显示界面"
+					content="日志"
 				>
-					<ElCheckbox
+					<ElButton
-						@change="handleAutoStartByTask"
+						:type="!data.logVisible ? 'info' : 'warning'"
-						:model-value="config.autoStart"
+						@click="handleShowLogDialog"
+						:icon="List"
 						size="small"
-					>
+						plain
-						开机自启
+					></ElButton>
-					</ElCheckbox>
 				</ElTooltip>
-				<div>
+				<ElTooltip
+					placement="left"
+					content="成员"
+				>
 					<ElButton
-						@click="handleShowCidrDialog"
+						@click="handleShowMemberDialog"
-						:icon="Share"
+						:icon="UserFilled"
-					>
+						plain
-						子网代理
+						type="success"
-					</ElButton>
+						size="small"
-					<ElButton
+					></ElButton>
-						@click="handleShowAdvanceDialog"
+				</ElTooltip>
-						:icon="Setting"
-					>
-						高级选项
-					</ElButton>
-				</div>
-				<div class="flex items-center gap-[0_5px]">
-					<div>
-						<ElButton
-							plain
-							type="primary"
-							size="small"
-							:icon="MagicStick"
-							@click="handleShowToolDialog"
-						>
-							增强工具
-						</ElButton>
-					</div>
-					<ElLink
-						class="!text-[9px] pb-[2px] ml-[8px] truncate"
-						type="info"
-						:underline="false"
-						@click="open('https://github.com/EasyTier/EasytierGame')"
-					>
-						EasytierGame主页
-					</ElLink>
-				</div>
 			</div>
 		</div>
-	</ElForm>
+		<div class="ml-auto">
+			<ElCheckbox
+				v-model="config.disbleP2p"
+				size="small"
+			>
+				强制中转
+			</ElCheckbox>
+			<ElTooltip
+				placement="top-start"
+				content="自启后隐藏于托盘，不显示界面"
+			>
+				<ElCheckbox
+					@change="handleAutoStartByTask"
+					:model-value="config.autoStart"
+					size="small"
+				>
+					开机自启
+				</ElCheckbox>
+			</ElTooltip>
+			<div>
+				<ElButton
+					@click="handleShowCidrDialog"
+					:icon="Share"
+					size="small"
+				>
+					子网代理
+				</ElButton>
+				<ElButton
+					@click="handleShowAdvanceDialog"
+					:icon="Setting"
+					size="small"
+				>
+					高级选项
+				</ElButton>
+			</div>
+			<div class="flex items-center gap-[0_5px]">
+				<div>
+					<ElButton
+						plain
+						type="primary"
+						size="small"
+						:icon="MagicStick"
+						@click="handleShowToolDialog"
+					>
+						增强工具
+					</ElButton>
+				</div>
+				
+				<ElBadge badge-class="!text-[9px] cursor-pointer" :hidden="!data.hasNewVersion" :offset="[6, 7]"  value="N">
+					<!-- <ElTooltip :disabled="!data.hasNewVersion" content="有新版发布了!"> -->
+						<ElLink
+							class="ml-[8px] truncate pb-[2px] !text-[9px]"
+							type="info"
+							:underline="false"
+							@click="open('https://github.com/EasyTier/EasytierGame')"
+						>EasytierGame主页</ElLink>
+					<!-- </ElTooltip> -->
+  				</ElBadge>
+			</div>
+		</div>
+	</div>
 	<ElDialog
 		width="95%"
 		top="10px"
@@ -341,6 +346,13 @@
 			>
 				刷新
 			</ElButton>
+			<ElTooltip placement="top" content="打开内核缓存目录">
+				<ElButton
+					:icon="Folder"
+					size="small"
+					@click="handleOpenCache"
+				></ElButton>
+			</ElTooltip>
 		</div>
 		<ElSelect
 			placeholder="请选择内核版本"
@@ -357,7 +369,7 @@
 				{{ release ? release[0] : "" }}
 			</ElOption>
 		</ElSelect>
-		<div class="pb-[5px] mt-[10px]">
+		<div class="mt-[10px] pb-[5px]">
 			<ElTooltip content="不使用出国软件也能告诉下载github Release包的地址，可自行搜索替换使用">
 				<ElText>github下载加速地址</ElText>
 			</ElTooltip>
@@ -459,6 +471,7 @@
 				v-model="mainStore.configPath"
 				no-data-text="目录没有配置文件"
 				placeholder="选择配置文件"
+				filterable
 			>
 				<ElOption
 					v-for="item in configStart.list"
@@ -485,47 +498,70 @@
 	import { invoke } from "@tauri-apps/api/core";
 	import { listen } from "@tauri-apps/api/event";
 	import { open, Command } from "@tauri-apps/plugin-shell";
-	import { QuestionFilled, Delete, List, UserFilled, Setting, Share, RefreshRight, Link, Tools, MagicStick } from "@element-plus/icons-vue";
+	import {
-	import { reactive, onBeforeUnmount, onMounted } from "vue";
+		QuestionFilled,
-	import { useTray, setTrayRunState, setTrayTooltip } from "~/composables/tray";
+		Delete,
+		List,
+		UserFilled,
+		Setting,
+		Share,
+		RefreshRight,
+		Link,
+		Tools,
+		MagicStick,
+		SetUp,
+		Folder
+	} from "@element-plus/icons-vue";
+	import { reactive, onBeforeUnmount, onMounted, ref } from "vue";
+	import { useTray, setTrayRunState, setTrayTooltip, checkNewVersion } from "~/composables/tray";
+	import { getMatches } from "@tauri-apps/plugin-cli";
 	import { initStartWinIpBroadcast } from "~/composables/netcard";
 	import useMainStore from "@/stores/index";
 	import { ElMessage, ElMessageBox } from "element-plus";
 	import { getCurrentWindow } from "@tauri-apps/api/window";
 	import { getAllWebviewWindows } from "@tauri-apps/api/webviewWindow";
 	import etWindows from "@/composables/windows";
-	import * as tauriAutoStart from "@tauri-apps/plugin-autostart";
 	import { resourceDir as getResourceDir, join } from "@tauri-apps/api/path";
 	import { readDir, exists, mkdir, BaseDirectory, readTextFile } from "@tauri-apps/plugin-fs";
 	import { updateConfigJson } from "~/composables/configJson";
 	import { writeText, readText } from "@tauri-apps/plugin-clipboard-manager";
 	import { sortedUniq, uniq } from "lodash-es";
-	import { bounce, addQQGroup } from "~/utils";
+	import { bounce, addQQGroup, supportProtocols, preventSleep, stopPreventSleep } from "~/utils";
+	import { ElConfirmDanger, ElConfirmPrimary } from "~/utils/element";
+	import { getServerArgs } from "@/composables/server";
 
 	let is_close = false;
 
-	const tray = await useTray(true, async () => {
+	const tray = await useTray(
-		is_close = true;
+		true,
-		await invoke("stop_command", { child_id: listenObj.thread_id || 0 });
+		async () => {
-		await invoke("stop_command", { child_id: data.winipBcPid || 0 });
+			is_close = true;
-	}, async () => {
+			await invoke("stop_command", { child_id: listenObj.thread_id || 0 });
-		await handleConnection();
+			await invoke("stop_command", { child_id: data.winipBcPid || 0 });
-		return data.isStart
+			await invoke("stop_command", { child_id: listenObj.server_thread_id.value || 0 });
-	});
+		},
+		async () => {
+			await handleConnection();
+			return data.isStart;
+		}
+	);
 
 	const mainStore = useMainStore();
 	const config = mainStore.config;
 	// console.error(config);
-	const protocols = ["tcp", "udp", "ws", "wss", "wg", "quic"];
+	const protocols = supportProtocols();
 	const data = reactive<{ [key: string]: any; releaseList: Array<Array<string>> }>({
+		hasNewVersion: false, //easytierGame有没有新版
 		logVisible: false,
 		cidrVisible: false,
 		advanceVisible: false,
 		toolVisible: false,
+		serverVisible: false,
 		winipBcPid: 0, //WinIPBroadcast进程id
 		winipBcStart: false,
 		memberVisible: false,
 		log: "",
+		serverLog: "", //服务端日志
 		update: false,
 		releaseList: [],
 		coreVersion: "-",
@@ -560,7 +596,7 @@
 			appWindow.onCloseRequested(async event => {
 				// console.error(appWindow.label);
 				if (!is_close) {
-					// console.error(1);
+					// console.error(1);s
 					event.preventDefault();
 					appWindow.hide();
 				}
@@ -568,6 +604,20 @@
 		}
 	};
 
+	const handleOpenCache = async () => {
+		const cache_path = import.meta.env.VITE_CACHE_PATH;
+		const resourceDir = await getResourceDir();
+		const configPath = await join(resourceDir, cache_path);
+		const isExists = await exists(cache_path, { baseDir: BaseDirectory.Resource });
+		if (!isExists) {
+			try {
+				await mkdir(cache_path, { baseDir: BaseDirectory.Resource });
+			} catch (err) {}
+		}
+		// console.error(configPath);
+		await Command.create("explorer", [configPath]).execute();
+	};
+
 	const handleDeleteServerUrl = (url: string) => {
 		const newBasePeers = [...mainStore.basePeers];
 		const idx = newBasePeers.indexOf(url);
@@ -601,31 +651,39 @@
 	const listenObj: { [key: string]: any } = {
 		unListenOutPut: null,
 		unListenThreadId: null,
+		unListenServerOutPut: null,
+		unListenServerThreadId: null,
 		unListenConfigStart: null,
+		unListenStartStopServer: null,
 		thread_id: null,
+		server_thread_id: ref(null),
 		async listenOutput() {
 			// const appWindow = getCurrentWindow();
-			const unListen = await listen("command-output", async event => {
+			const unListen = await listen<string>("command-output", async event => {
 				data.isStart = true;
 				// console.error(event.payload);
 				if (event.payload) {
 					data.startLoading = false;
 					let ipv4 = /dhcp ip changed. old: None, new: Some\((\d+\.\d+\.\d+\.\d+).*\)/g.exec(event.payload as string)?.[1];
 					let devName = /tun device ready. dev: (.*)/g.exec(event.payload as string)?.[1];
-					if (config.dhcp || mainStore.configStartEnable) {
+					if (mainStore.configStartEnable || mainStore.config.dhcp) {
-						if (ipv4) {
+						let configIpv4 = /ipv4\s.*=\s.*[\'\"](\d+\.\d+\.\d+\.\d+).*[\'\"]/g.exec(event.payload as string)?.[1];
-							config.ipv4 = ipv4;
+						if (configIpv4) {
-							await setTrayRunState(tray, true);
+							mainStore.config.ipv4 = configIpv4;
-							data.isSuccessGetIp = true;
-							await setTrayTooltip(tray, `IP: ${ipv4}`);
-						}
-					} else {
-						if ((event.payload as string).includes("new peer connection added") && !data.isSuccessGetIp) {
-							await setTrayRunState(tray, true);
-							data.isSuccessGetIp = true;
-							await setTrayTooltip(tray, `IP: ${config.ipv4}`);
 						}
 					}
+					// if (event.payload.includes("peer connection removed")) {
+					// 	data.isSuccessGetIp = false;
+					// }
+					if (event.payload.includes("new peer connection added") && !data.isSuccessGetIp) {
+						await setTrayRunState(tray, true);
+						data.isSuccessGetIp = true;
+						await setTrayTooltip(tray, `IP: ${mainStore.config.ipv4}`);
+					}
+					if (ipv4) {
+						mainStore.config.ipv4 = ipv4;
+						await setTrayTooltip(tray, `IP: ${ipv4}`);
+					}
 					if (
 						devName &&
 						mainStore.config.enableNetCardMetric &&
@@ -662,14 +720,59 @@
 			});
 			this.unListenThreadId = unListen;
 		},
+		async listenServerOutPut() {
+			const unListen = await listen<string>("server-command-output", async event => {
+				// console.log("server-command-output", event);
+				const logArr = data.serverLog.split("\n");
+				const start = logArr.length > 1000 ? logArr.length - 1000 : 0;
+				data.serverLog = logArr.slice(start).join("\n");
+				data.serverLog += (event.payload || "") + "\n";
+			});
+			this.unListenServerOutPut = unListen;
+		},
+		async listenServerThreadId() {
+			const unListen = await listen("server-thread-id", event => {
+				if (event.payload) {
+					this.server_thread_id.value = event.payload;
+				}
+			});
+			this.unListenServerThreadId = unListen;
+		},
 		async listenConfigStart() {
+			const appWindow = getCurrentWindow();
 			const unListen = await listen("config", event => {
-				// console.error("config", event.payload);
 				const ipv4 = config.ipv4;
+				console.log(event.payload)
 				mainStore.$patch(event.payload as any);
 				config.ipv4 = ipv4;
+				if(mainStore.config.enablePreventSleep) {
+					preventSleep();
+				}else {
+					stopPreventSleep();
+				}
+				appWindow.emitTo({ kind: "Any" }, "global-main-store", { store: { ...mainStore.$state } });
 			});
-			this.unListenConfigStart = unListen;
+			const unListen2 = mainStore.$subscribe(() => {
+				appWindow.emitTo({ kind: "Any" }, "global-main-store", { store: { ...mainStore.$state } });
+			})
+			this.unListenConfigStart = [unListen, unListen2];
+		},
+		async listenStartStopServer() {
+			const unListen = await listen<{ args: Array<string> }>("startStopServer", async event => {
+				await listenObj?.unListenServerOutPut?.();
+				await invoke("stop_command", { child_id: listenObj.server_thread_id.value || 0 });
+				if (listenObj.server_thread_id.value) {
+					listenObj.server_thread_id.value = null;
+				} else {
+					data.serverLog = "";
+					await listenObj.listenServerOutPut();
+					await invoke("run_command", {
+						args: event.payload.args,
+						is_server: true
+					});
+				}
+			});
+			this.unListenStartStopServer = unListen;
 		}
 	};
 
@@ -701,7 +804,7 @@
 			const currentVersion = /(\d+\.\d+\.\d+)/g.exec(data.coreVersion || "")?.[1];
 			if (version && currentVersion != version) {
 				// console.error({ currentVersion, latestVersion });
-				ElMessage.success(`更新 -> ${version}`);
+				ElMessage.success(`变更为 -> ${version}`);
 				return [true, downloadUrl, versionFileName];
 			} else if (currentVersion === version) {
 				ElMessage.success(`当前版本无需安装`);
@@ -756,42 +859,6 @@
 		// console.log(data.releaseList);
 	};
 
-	const handleAutoStart = async () => {
-		let is_enable = await tauriAutoStart.isEnabled();
-		if (!config.autoStart && !is_enable) {
-			try {
-				await tauriAutoStart.enable();
-			} catch (err) {
-				ElMessage.error(`开机自启失败`);
-			}
-		} else {
-			try {
-				await tauriAutoStart.disable();
-			} catch (err) {
-				// ElMessage.error(`取消自启失败`);
-			}
-		}
-		is_enable = await tauriAutoStart.isEnabled();
-		if (!is_enable) {
-			config.autoStart = false;
-		} else {
-			config.autoStart = true;
-		}
-	};
-
-	const initAutoStart = async () => {
-		try {
-			const is_enable = await tauriAutoStart.isEnabled();
-			if (!is_enable) {
-				config.autoStart = false;
-			} else {
-				config.autoStart = true;
-			}
-		} catch (err) {
-			config.autoStart = false;
-		}
-	};
-
 	const handleAutoStartByTask = async () => {
 		await invoke("spawn_autostart", { enabled: !config.autoStart });
 		const is_enable_by_task = (await invoke("autostart_is_enabled")) as boolean;
@@ -800,11 +867,6 @@
 
 	const compatibleInitAutoStart = async () => {
 		try {
-			const is_enable = await tauriAutoStart.isEnabled();
-			if (is_enable) {
-				await invoke("spawn_autostart", { enabled: true });
-				await tauriAutoStart.disable();
-			}
 			let is_enable_by_task = (await invoke("autostart_is_enabled")) as boolean;
 			if (is_enable_by_task) {
 				// 每次打开Exe重新加载一次开机自启，因为可能路径变了
@@ -882,27 +944,66 @@
 		});
 	};
 
+	const initAutoStartServer = async () => {
+		if (mainStore.serverConfig.autoStart && data.coreVersion) {
+			const args = getServerArgs();
+			await listenObj?.unListenServerOutPut?.();
+			await invoke("stop_command", { child_id: listenObj.server_thread_id.value || 0 });
+			data.serverLog = "";
+			await listenObj.listenServerOutPut();
+			await invoke("run_command", {
+				args,
+				is_server: true
+			});
+		}
+	};
+
+	const initPreventSleep = async () => {
+		if (mainStore.config.enablePreventSleep) {
+		    preventSleep();
+		}
+	}
+
+	const mountedShow = async () => {
+		const args = await getMatches();
+		if (!args.args?.["task-auto-start"]?.value) {
+			const appWindow = getCurrentWindow();
+			await appWindow.show();
+			await appWindow.setFocus();
+		}
+	};
+
 	let logsTimer: NodeJS.Timeout | null = null;
+	let serverLogsTimer: NodeJS.Timeout | null = null;
 
 	onMounted(async () => {
-		// await handleUpdateCore();  //默认不自动更新
 		await initGuiJson();
 		await compatibleInitAutoStart();
 		// await initAutoStart();
 		await initStartWinIpBroadcast();
 		await getCoreVersion();
 		await listenObj.listenThreadId();
+		await listenObj.listenServerThreadId();
 		await listenObj.listenConfigStart();
+		await listenObj.listenStartStopServer();
 		await initConfigDir();
+		await initAutoStartServer();
 		await initConnectAfterStart();
+		initPreventSleep();
+		mountedShow(); // 不需要await
 		closePrevent();
+		data.hasNewVersion = await checkNewVersion();
 	});
 
 	onBeforeUnmount(() => {
 		unListenAll();
 		listenObj.unListenReleaseList && listenObj.unListenReleaseList();
-		listenObj.unListenConfigStart && listenObj.unListenConfigStart();
+		listenObj.unListenConfigStart && listenObj.unListenConfigStart[0]();
+		listenObj.unListenConfigStart && listenObj.unListenConfigStart[1]();
+		listenObj.unListenStartStopServer && listenObj.unListenStartStopServer();
 		logsTimer && clearInterval(logsTimer);
+		serverLogsTimer && clearInterval(serverLogsTimer);
+		stopPreventSleep();
 	});
 
 	const getArgs = async () => {
@@ -934,6 +1035,7 @@
 				return [];
 			}
 		}
+
 		if (config.dhcp) {
 			args.push("-d");
 		}
@@ -953,6 +1055,12 @@
 			const formatUrl = config.serverUrl.replace(/\\/g, "/");
 			args.push("--peers", ...config.protocol.map(protocol => `${protocol}://${formatUrl}`));
 		}
+		if (config.enableCustonProtocol) {
+			const includes = config.protocol.includes(config.customProtocol);
+			if (includes) {
+				args.push("--default-protocol", config.customProtocol);
+			}
+		}
 		if (config.disbleP2p) {
 			args.push("--disable-p2p");
 		}
@@ -962,6 +1070,19 @@
 		if (config.disbleListenner) {
 			args.push("--no-listener");
 		}
+		if (!config.disbleListenner && config.enableCustomListener && config.customListenerData) {
+			const customListener = config.customListenerData
+				.trim()
+				.split("\n")
+				.map(el => el.trim())
+				.filter(el => el);
+			if (customListener.length > 0) {
+				args.push("-l", ...customListener);
+			}
+		}
+		if (!config.disbleListenner && !config.enableCustomListener && config.port) {
+			args.push("-l", config.port);
+		}
 		if (mainStore.cidrEnable && config.proxyNetworks) {
 			// console.error(config.proxyNetworks);
 			const reg = /\d+\.\d+\.\d+\.\d+\/\d+/g;
@@ -1103,14 +1224,17 @@
 			importConfigData.data = "";
 			importConfigData.visible = true;
 		}
+		if (command === "create_server") {
+			await handleShowServerDialog();
+		}
 	};
 
 	const handleStartImport = async () => {
-		try {
+		const [err] = await ElConfirmPrimary("确定导入?", "提示", {
-			await ElMessageBox.confirm("确定导入?", "提示", {
+			confirmButtonText: "确定",
-				confirmButtonText: "确定",
+			cancelButtonText: "取消"
-				cancelButtonText: "取消"
+		});
-			});
+		if (!err) {
 			const payload = JSON.parse(decodeURIComponent(atob(importConfigData.data)));
 			mainStore.$patch({
 				config: {
@@ -1121,7 +1245,7 @@
 			ElMessage.success("导入成功");
 			importConfigData.visible = false;
 			mainStore.basePeers = uniq([config.serverUrl, ...mainStore.basePeers]);
-		} catch (err) {
+		} else {
 			console.error(err);
 			if (err !== "cancel") {
 				ElMessage.error("导入失败");
@@ -1189,10 +1313,11 @@
 				data.logVisible = true;
 				logsTimer && clearInterval(logsTimer);
 				logsTimer = setInterval(() => {
-					appWindow.emitTo("log", "logs", data.log);
+					appWindow.emitTo({ kind: "WebviewWindow", label: "log" }, "logs", data.log);
-				}, 600);
+				}, 650);
 			},
 			() => {
+				logsTimer && clearInterval(logsTimer);
 				data.logVisible = false;
 			}
 		);
@@ -1254,4 +1379,33 @@
 			}
 		);
 	};
+
+	const handleShowServerDialog = async () => {
+		await etWindows(
+			"server",
+			{
+				title: "自建服务器",
+				minWidth: 550,
+				minHeight: 460,
+				width: 550,
+				height: 460,
+				resizable: true,
+				url: "#/server"
+			},
+			(_, appWindow) => {
+				data.serverVisible = true;
+				serverLogsTimer && clearInterval(serverLogsTimer);
+				serverLogsTimer = setInterval(() => {
+					appWindow.emitTo({ kind: "WebviewWindow", label: "server" }, "server_logs", {
+						log: data.serverLog,
+						threadId: listenObj.server_thread_id.value
+					});
+				}, 650);
+			},
+			() => {
+				serverLogsTimer && clearInterval(serverLogsTimer);
+				data.serverVisible = false;
+			}
+		);
+	};
 </script>

pages/member.vue

@@ -1,26 +1,35 @@
 <template>
 	<div class="overflow-auto h-full">
 		<div class="w-[1200px]">
-			<span v-if="!data.member || data.member.length <= 0">{{ "等待成员信息中..." }}</span>
+			<ElText size="small" v-if="!data.member || data.member.length <= 0">{{ "等待成员信息中..." }}</ElText>
 			<ElTable
 				stripe
 				border
 				:data="data.member"
-				v-else>
+				v-else
+			>
 				<ElTableColumn
 					sortable
 					width="140"
 					label="主机名"
-					prop="hostname"></ElTableColumn>
+					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="路由">
+					label="方式"
+				>
 					<template #default="{ row }">
 						<ElTag
+							size="small"
 							effect="dark"
-							:type="row.cost == 'p2p' ? 'success' : 'info'">
+							:type="row.cost == 'p2p' ? 'success' : 'info'"
+						>
 							{{ row.cost }}
 						</ElTag>
 					</template>
@@ -29,34 +38,57 @@
 					sortable
 					width="120"
 					prop="ipv4"
-					label="虚拟网IP"></ElTableColumn>
+					label="虚拟网IP"
+				></ElTableColumn>
 				<ElTableColumn
 					sortable
 					prop="lat_ms"
-					width="130"
+					width="100"
-					label="延迟/ms"></ElTableColumn>
+					label="延迟/ms"
+				></ElTableColumn>
 				<ElTableColumn
 					sortable
-					width="120"
+					width="100"
 					prop="loss_rate"
-					label="丢包率">
+					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="120"
+					width="110"
-					label="nat_type"
+					label="NAT类型"
-					prop="NAT类型">
+					prop="nat_type"
+				>
 					<template #default="{ row }">
 						{{ natMaps[row.nat_type.toLowerCase() as natKyes] || row.nat_type || "-" }}
 					</template>
 				</ElTableColumn>
 				<ElTableColumn
 					sortable
+					width="122"
 					prop="version"
-					label="版本"></ElTableColumn>
+					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>
@@ -64,7 +96,9 @@
 <script setup lang="ts">
 	import { invoke } from "@tauri-apps/api/core";
 	import { reactive, onMounted, onBeforeUnmount } from "vue";
-	import { parsePeerInfo } from "@/utils";
+	import { ATJ, parsePeerInfo } 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;
@@ -86,14 +120,14 @@
 		restricted: "nat2",
 		portrestricted: "nat3",
 		symmetric: "nat4",
-		SymmetricEasyDec: "nat4-easydec",
+		symmetriceasydec: "nat4-easydec",
-		SymmetricEasyInc: "nat4-easyinc",
+		symmetriceasyinc: "nat4-easyinc",
-		SymUdpFirewall: "nat4-udpfirewall",
+		symUdpfirewall: "nat4-udpfirewall"
 	};
 	type natKyes = keyof typeof natMaps;
 
-	const data = reactive<{ member: any[] }>({
+	const data = reactive<{ member: {hostname: string, cost: string, ipv4: string, lat_msg: string, loss_rate: string, nat_type: string}[] }>({
-		member: [],
+		member: []
 	});
 
 	const _showTableHeader = [
@@ -104,12 +138,37 @@
 		["loss_rate", "丢包率"],
 		["nat_type", "NAT类型"],
 		["version", "版本"],
+		["tunnel_proto", "隧道协议"],
+		['rx_bytes', '接收'],
+		['tx_bytes', '传输']
 	];
 
+	let timer: NodeJS.Timeout | null = null;
+
 	const listenOutput = async () => {
-		const member = await invoke<string>("get_members_by_cli");
+		const [error, member] = await ATJ(invoke<string>("get_members_by_cli"));
+		// if(!member) return;
+		if (error) {
+			data.member = [];
+			return "";
+		}
+		if (member === "_EasytierGameCliFailedToConnect_") {
+			data.member = [];
+			stopTimer();
+			const [error] = await ElConfirmDanger("连接已断开,是否重新尝试?", "警告", {
+				confirmButtonText: "重试",
+				cancelButtonText: "关闭窗口"
+			});
+			if (!error) {
+				await listenOutput();
+			} else {
+				const appWindow = getCurrentWindow();
+				await appWindow.close();
+			}
+			return;
+		}
 		const peerInfo = parsePeerInfo(member);
-		peerInfo.forEach((value) => {
+		peerInfo.forEach(value => {
 			if (value.cost === "Local") {
 				value.cost = "本机";
 			}
@@ -117,20 +176,28 @@
 				value.ipv4 = value.ipv4.split("/")[0];
 			}
 		});
-		// console.error(peerInfo);
+		// console.log(peerInfo)
 		data.member = peerInfo;
+		startTimer();
 	};
 
-	let timer: NodeJS.Timeout | null = null;
+	const startTimer = () => {
+		timer && clearTimeout(timer);
+		timer = setTimeout(() => {
+			listenOutput();
+		}, 1000);
+	};
+
+	const stopTimer = () => {
+		timer && clearTimeout(timer);
+		timer = null;
+	}
 
 	onMounted(async () => {
-		listenOutput();
+		await listenOutput();
-		timer = setInterval(() => {
-			listenOutput();
-		}, 1000 * 10);
 	});
 
 	onBeforeUnmount(() => {
-		timer && clearInterval(timer);
+		stopTimer();
 	});
 </script>

pages/server.vue

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

pages/tool.vue

@@ -181,8 +181,8 @@
 	import { onMounted, reactive } from "vue";
 	import useMainStore from "@/stores/index";
 	import { handleWinipBcStart, initStartWinIpBroadcast } from "@/composables/netcard";
-	import { getCurrentWindow } from "@tauri-apps/api/window";
 	import { isValidIP } from "~/utils";
+	import { dataSubscribe } from "~/composables/windows";
 
 	const mainStore = useMainStore();
 	const data = reactive({
@@ -253,18 +253,18 @@
 					if (output.stderr) {
 						data.pingLog += `${i + 1}error - ${output.stderr}`;
 					}
-					if(i != data.pingNum - 1) {
+					if (i != data.pingNum - 1) {
 						await awaitTime(1000);
 					}
 				}
-				data.pingLog += '完毕'
+				data.pingLog += "完毕";
 			} catch (err) {
 				ElMessage.error("Ping发生错误");
 				console.error(err);
 			} finally {
 				data.isPing = false;
 			}
-		}else {
+		} else {
 			ElMessage.error("请输入正确的IP");
 		}
 	};
@@ -328,10 +328,13 @@
 		}
 	};
 
-	const appWindow = getCurrentWindow();
+	dataSubscribe(async (...a) => {
-	mainStore.$subscribe((...a) => {
+		return {
-		// console.error("subscribe", a);
+			winIpBcAutoStart: mainStore.winIpBcAutoStart,
-		appWindow.emitTo("main", "config", { winIpBcAutoStart: mainStore.winIpBcAutoStart, config: { ...mainStore.config } });
+			winipBcStart: mainStore.winipBcStart,
+			winipBcPid: mainStore.winipBcPid,
+			config: { ...mainStore.config }
+		};
 	});
 
 	onMounted(() => {

src-tauri/Cargo.lock

@@ -95,6 +95,55 @@ dependencies = [
  "libc",
 ]
 
+[[package]]
+name = "anstream"
+version = "0.6.18"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8acc5369981196006228e28809f761875c0327210a891e941f4c683b3a99529b"
+dependencies = [
+ "anstyle",
+ "anstyle-parse",
+ "anstyle-query",
+ "anstyle-wincon",
+ "colorchoice",
+ "is_terminal_polyfill",
+ "utf8parse",
+]
+
+[[package]]
+name = "anstyle"
+version = "1.0.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "55cc3b69f167a1ef2e161439aa98aed94e6028e5f9a59be9a6ffb47aef1651f9"
+
+[[package]]
+name = "anstyle-parse"
+version = "0.2.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3b2d16507662817a6a20a9ea92df6652ee4f94f914589377d69f3b21bc5798a9"
+dependencies = [
+ "utf8parse",
+]
+
+[[package]]
+name = "anstyle-query"
+version = "1.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "79947af37f4177cfead1110013d678905c37501914fba0efea834c3fe9a8d60c"
+dependencies = [
+ "windows-sys 0.59.0",
+]
+
+[[package]]
+name = "anstyle-wincon"
+version = "3.0.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2109dbce0e72be3ec00bed26e6a7479ca384ad226efdd66db8fa2e3a38c83125"
+dependencies = [
+ "anstyle",
+ "windows-sys 0.59.0",
+]
+
 [[package]]
 name = "anyhow"
 version = "1.0.92"
@@ -306,17 +355,6 @@ version = "1.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0"
 
-[[package]]
-name = "auto-launch"
-version = "0.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1f012b8cc0c850f34117ec8252a44418f2e34a2cf501de89e29b241ae5f79471"
-dependencies = [
- "dirs 4.0.0",
- "thiserror 1.0.64",
- "winreg 0.10.1",
-]
-
 [[package]]
 name = "autocfg"
 version = "1.4.0"
@@ -692,6 +730,33 @@ dependencies = [
  "inout",
 ]
 
+[[package]]
+name = "clap"
+version = "4.5.21"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fb3b4b9e5a7c7514dfa52869339ee98b3156b0bfb4e8a77c4ff4babb64b1604f"
+dependencies = [
+ "clap_builder",
+]
+
+[[package]]
+name = "clap_builder"
+version = "4.5.21"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b17a95aa67cc7b5ebd32aa5370189aa0d79069ef1c64ce893bd30fb24bff20ec"
+dependencies = [
+ "anstream",
+ "anstyle",
+ "clap_lex",
+ "strsim",
+]
+
+[[package]]
+name = "clap_lex"
+version = "0.7.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "afb84c814227b90d6895e01398aee0d8033c00e7466aca416fb6a8e0eb19d8a7"
+
 [[package]]
 name = "clipboard-win"
 version = "5.4.0"
@@ -731,6 +796,12 @@ dependencies = [
  "objc",
 ]
 
+[[package]]
+name = "colorchoice"
+version = "1.0.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5b63caa9aa9397e2d9480a9b13673856c78d8ac123288526c37d7839f2a86990"
+
 [[package]]
 name = "combine"
 version = "4.6.7"
@@ -1057,33 +1128,13 @@ dependencies = [
  "subtle",
 ]
 
-[[package]]
-name = "dirs"
-version = "4.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ca3aa72a6f96ea37bbc5aa912f6788242832f75369bdfdadcb0e38423f100059"
-dependencies = [
- "dirs-sys 0.3.7",
-]
-
 [[package]]
 name = "dirs"
 version = "5.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "44c45a9d03d6676652bcb5e724c7e988de1acad23a711b5217ab9cbecbec2225"
 dependencies = [
- "dirs-sys 0.4.1",
+ "dirs-sys",
-]
-
-[[package]]
-name = "dirs-sys"
-version = "0.3.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1b1d1d91c932ef41c0f2663aa8b0ca0342d444d842c06914aa0a7e352d0bada6"
-dependencies = [
- "libc",
- "redox_users",
- "winapi",
 ]
 
 [[package]]
@@ -1176,7 +1227,7 @@ checksum = "0d6ef0072f8a535281e4876be788938b528e9a1d43900b82c2569af7da799125"
 
 [[package]]
 name = "easytier-game"
-version = "1.2.4"
+version = "1.3.1"
 dependencies = [
  "log",
  "planif",
@@ -1186,13 +1237,14 @@ dependencies = [
  "sysinfo",
  "tauri",
  "tauri-build",
- "tauri-plugin-autostart",
+ "tauri-plugin-cli",
  "tauri-plugin-clipboard-manager",
  "tauri-plugin-fs",
  "tauri-plugin-log",
  "tauri-plugin-shell",
  "tauri-plugin-single-instance",
  "tauri-plugin-window-state",
+ "tokio",
  "whoami",
  "windows 0.58.0",
  "zip",
@@ -1215,7 +1267,7 @@ dependencies = [
  "rustc_version",
  "toml 0.8.2",
  "vswhom",
- "winreg 0.52.0",
+ "winreg",
 ]
 
 [[package]]
@@ -2164,6 +2216,12 @@ dependencies = [
  "once_cell",
 ]
 
+[[package]]
+name = "is_terminal_polyfill"
+version = "1.70.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7943c866cc5cd64cbc25b2e01621d07fa8eb2a1a23160ee81ce38704e97b8ecf"
+
 [[package]]
 name = "itoa"
 version = "0.4.8"
@@ -4312,7 +4370,7 @@ checksum = "e545de0a2dfe296fa67db208266cd397c5a55ae782da77973ef4c4fac90e9f2c"
 dependencies = [
  "anyhow",
  "bytes",
- "dirs 5.0.1",
+ "dirs",
  "dunce",
  "embed_plist",
  "futures-util",
@@ -4363,7 +4421,7 @@ checksum = "7bd2a4bcfaf5fb9f4be72520eefcb61ae565038f8ccba2a497d8c28f463b8c01"
 dependencies = [
  "anyhow",
  "cargo_toml",
- "dirs 5.0.1",
+ "dirs",
  "glob",
  "heck 0.5.0",
  "json-patch",
@@ -4436,12 +4494,12 @@ dependencies = [
 ]
 
 [[package]]
-name = "tauri-plugin-autostart"
+name = "tauri-plugin-cli"
 version = "2.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bba6bb936e0fd0a58ed958b49e2e423dd40949c9d9425cc991be996959e3838e"
+checksum = "2bccd4692b56822a60874542c7655546c8e7aed3c2e2926166e1498e595bd2a2"
 dependencies = [
- "auto-launch",
+ "clap",
  "log",
  "serde",
  "serde_json",
@@ -4782,15 +4840,16 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20"
 
 [[package]]
 name = "tokio"
-version = "1.40.0"
+version = "1.41.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e2b070231665d27ad9ec9b8df639893f46727666c6767db40317fbe920a5d998"
+checksum = "22cfb5bee7a6a52939ca9224d6ac897bb669134078daa8735560897f69de4d33"
 dependencies = [
  "backtrace",
  "bytes",
  "libc",
  "mio",
  "pin-project-lite",
+ "signal-hook-registry",
  "socket2",
  "windows-sys 0.52.0",
 ]
@@ -4933,7 +4992,7 @@ checksum = "533fc2d4105e0e3d96ce1c71f2d308c9fbbe2ef9c587cab63dd627ab5bde218f"
 dependencies = [
  "core-graphics 0.24.0",
  "crossbeam-channel",
- "dirs 5.0.1",
+ "dirs",
  "libappindicator",
  "muda",
  "objc2",
@@ -5085,6 +5144,12 @@ version = "0.1.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "86bd8d4e895da8537e5315b8254664e6b769c4ff3db18321b297a1e7004392e3"
 
+[[package]]
+name = "utf8parse"
+version = "0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821"
+
 [[package]]
 name = "uuid"
 version = "1.10.0"
@@ -5786,15 +5851,6 @@ dependencies = [
  "memchr",
 ]
 
-[[package]]
-name = "winreg"
-version = "0.10.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "80d0f4e272c85def139476380b12f9ac60926689dd2e01d4923222f40580869d"
-dependencies = [
- "winapi",
-]
-
 [[package]]
 name = "winreg"
 version = "0.52.0"

src-tauri/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "easytier-game"
-version = "1.2.4"
+version = "1.3.1"
 homepage = "https://github.com/EasyTier/EasyTier"
 repository = "https://github.com/EasyTier/EasytierGame"
 description = "A simple network initiator based on Easytier"
@@ -34,20 +34,22 @@ tauri = { version = "2.1.1", features = [
 tauri-plugin-log = "2.0.2"
 tauri-plugin-shell = "2.0.2"
 reqwest = { version = "0.12", features = ["json"] }
-zip = "2.2.0"
+zip = "2.2"
 sysinfo = '0.32.0'
 planif = { git = "https://github.com/mattrobineau/planif", tag = "1.0.1" }
 whoami = "1.5.2"
 tauri-plugin-fs = "2"
 tauri-plugin-clipboard-manager = "2.0.2"
+tokio = { version = "1.41.1", features = ["process"] }
 # prost = "0.13"
 # prost-types = "0.13"
 
+
 [dependencies.windows]
 version = "0.58.0"
-features = ["Win32_System_TaskScheduler"]
+features = ["Win32_System_TaskScheduler", "Win32_System_Power"]
 
 [target."cfg(not(any(target_os = \"android\", target_os = \"ios\")))".dependencies]
-tauri-plugin-autostart = "2.0.1"
+tauri-plugin-cli = "2"
 tauri-plugin-single-instance = "2.0.1"
 tauri-plugin-window-state = "2"

src-tauri/capabilities/default.json

@@ -8,11 +8,13 @@
     "member",
     "cidr",
     "advance",
-    "tool"
+    "tool",
+    "server"
   ],
   "permissions": [
     "core:default",
     "core:window:allow-minimize",
+    "core:window:allow-unminimize",
     "core:window:allow-hide",
     "core:window:allow-close",
     "core:window:allow-set-focus",
@@ -29,10 +31,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",
@@ -96,6 +94,10 @@
     "window-state:allow-save-window-state",
     "window-state:allow-restore-state",
 
+    
+    "cli:default",
+    "cli:allow-cli-matches",
+
     "log:default",
     "log:allow-log"
   ]

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/test.toml

@@ -1,23 +0,0 @@
-hostname = "Test1"
-instance_name = "default"
-instance_id = "8803362c-e4f1-4df1-93e8-721653945f77"
-dhcp = true
-listeners = [
-    "tcp://0.0.0.0:11010",
-    "udp://0.0.0.0:11010",
-    "wg://0.0.0.0:11011",
-    "ws://0.0.0.0:11011/",
-    "wss://0.0.0.0:11012/",
-]
-exit_nodes = []
-rpc_portal = "0.0.0.0:15888"
-
-[network_identity]
-network_name = "default"
-network_secret = ""
-
-[[peer]]
-uri = "tcp://public.easytier.top:11010"
-
-[[peer]]
-uri = "udp://public.easytier.top:11010"

src-tauri/easytier/config_template.json

@@ -21,6 +21,8 @@
     "dhcp": false,  // 动态分配IP
     "devName": false, // 是否启用自定义网卡名
     "devNameValue": "", // 网卡名(启用devName之后才生效)
+    "enableCustonProtocol": false,  // 是否启用自定义协议
+    "customProtocol": "tcp", // 自定义协议类型
     "enableNetCardMetric": false,  // 自定义easytier每次生成的网卡跃点
     "netCardMetricValue": 1 // 网卡跃点数量(1-9999)
 }

src-tauri/src/lib.rs

@@ -9,21 +9,41 @@ 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::sync::mpsc;
-    atomic::{AtomicBool, Ordering},
-    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::System::Com::*;
 use windows::Win32::System::TaskScheduler::*;
 
+use windows::Win32::System::Power::SetThreadExecutionState;
+use windows::Win32::System::Power::{
+    ES_CONTINUOUS, ES_DISPLAY_REQUIRED, ES_SYSTEM_REQUIRED, EXECUTION_STATE,
+};
+
+use tokio::process::Command as tokioCommand;
+
+#[tauri::command(rename_all = "snake_case")]
+fn prevent_sleep() -> bool {
+    unsafe {
+        let result =
+            SetThreadExecutionState(ES_SYSTEM_REQUIRED | ES_DISPLAY_REQUIRED | ES_CONTINUOUS);
+        result != EXECUTION_STATE(0)
+    }
+}
+
+#[tauri::command(rename_all = "snake_case")]
+fn allow_sleep() -> bool {
+    unsafe {
+        let result = SetThreadExecutionState(ES_CONTINUOUS);
+        result != EXECUTION_STATE(0)
+    }
+}
+
 // 定义GitHub Release的结构体
 #[derive(Debug, Deserialize)]
 pub struct Release {
@@ -58,9 +78,50 @@ pub async fn fetch_releases() -> Result<Vec<Release>, Error> {
     response.json::<Vec<Release>>().await
 }
 
+#[tauri::command(rename_all = "snake_case")]
+async fn fetch_game_releases() -> [String; 2] {
+    // 创建HTTP客户端
+    let client = Client::new();
+    // 构建请求的URL
+    let url = format!("https://api.github.com/repos/Easytier/EasytierGame/releases",);
+
+    // 发送HTTP GET请求
+    if let Ok(response) = client
+        .get(&url)
+        .header("User-Agent", "Tauri-fetch")
+        .send()
+        .await
+    {
+        // 反序列化响应体为Release列表
+        match response.json::<Vec<Release>>().await {
+            Ok(releases) => {
+                if releases.len() <= 0 {
+                    return [String::from(""), String::from("")];
+                }
+                let release = releases.first().unwrap();
+                let tag_name = release.tag_name.as_str();
+                let browser_download_url = release
+                    .assets
+                    .first()
+                    .unwrap()
+                    .browser_download_url
+                    .as_str();
+                [String::from(tag_name), String::from(browser_download_url)]
+            }
+            Err(_e) => {
+                log::error!("game release {}", _e.to_string());
+                [String::from(""), String::from("")]
+            }
+        }
+    } else {
+        log::error!("failed to get game release");
+        [String::from(""), String::from("")]
+    }
+}
+
 #[tauri::command(rename_all = "snake_case")]
 fn get_core_version() -> String {
-    let core_path = get_tool_exe_path(String::from("\\easytier\\easytier-core.exe"));
+    let core_path = get_tool_exe_path("\\easytier\\easytier-core.exe");
     match Command::new(&core_path)
         .arg("--version")
         .creation_flags(0x08000000)
@@ -80,7 +141,7 @@ fn get_core_version() -> String {
 // #[tauri::command(rename_all = "snake_case")]
 // #[warn(dead_code)]
 // fn get_cli_version() -> String {
-//     let cli_path = get_tool_exe_path(String::from("\\easytier\\easytier-cli.exe"));
+//     let cli_path = get_tool_exe_path("\\easytier\\easytier-cli.exe");
 //     match Command::new(&cli_path)
 //         .arg("--version")
 //         .creation_flags(0x08000000)
@@ -94,9 +155,10 @@ fn get_core_version() -> String {
 //     }
 // }
 
-fn get_tool_exe_path(path: String) -> String {
+fn get_tool_exe_path(path: &str) -> String {
     let cur_vec = get_exe_directory();
-    let tool_path = cur_vec[1].to_string() + &path.to_string();
+    let tool_path = format!("{}{}", cur_vec[1].as_str(), path);
+    // log::error!("tool path: {}", tool_path);
     return tool_path;
 }
 
@@ -133,29 +195,47 @@ struct MyResponse {
 }
 
 #[tauri::command(rename_all = "snake_case")]
-fn get_members_by_cli() -> String {
+async fn get_members_by_cli() -> String {
-    let cli_path = get_tool_exe_path(String::from("\\easytier\\easytier-cli.exe"));
+    let cli_path = get_tool_exe_path("\\easytier\\easytier-cli.exe");
-    match Command::new(&cli_path)
+    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) {
+    let cache_dir_path = get_tool_exe_path("\\easytier\\cache");
+    let cache_file_name = format!("{}\\{}", cache_dir_path, file_name);
+    let cache_file_name_path = path::Path::new(&cache_file_name);
+    if cache_file_name_path.exists() {
+        unzip(cache_file_name_path);
+        return;
+    }
+
     let target = format!("{}", download_url);
     let response = reqwest::get(target)
         .await
         .expect("error to download easytier url");
-    let easytier_path = get_tool_exe_path(String::from("\\easytier"));
+    let easytier_path = get_tool_exe_path("\\easytier");
     let file_path = format!("{}\\{}", easytier_path, file_name);
     println!("download easytier to {}", file_path);
 
@@ -177,10 +257,19 @@ async fn download_easytier_zip(download_url: String, file_name: String) {
     file.write_all(&content).expect("error to write easytier");
     println!("写入完成");
     unzip(path);
-    match fs::remove_file(path) {
+
-        Ok(_) => println!("删除zip文件成功"),
+    let cache_dir_path = path::Path::new(&cache_dir_path);
-        Err(_) => log::error!("删除zip文件失败"),
+    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) {
@@ -213,7 +302,7 @@ fn unzip(fname: &path::Path) {
         //         fs::create_dir_all(p).unwrap();
         //     }
         // }
-        let easytier_path = get_tool_exe_path(String::from("\\easytier"));
+        let easytier_path = get_tool_exe_path("\\easytier");
         let easytier_dir = path::Path::new(&easytier_path);
         // if !easytier_dir.exists() {
         //     fs::create_dir_all(&easytier_dir).unwrap();
@@ -228,20 +317,24 @@ 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>>,
-) {
     let (tx, rx) = mpsc::channel();
-    stop_signal.store(false, Ordering::Relaxed);
+
     let app_handle1 = app_handle.clone();
     let app_handle2 = app_handle.clone();
-    let stop_signal1 = Arc::clone(&stop_signal);
+
-    let stop_signal2 = Arc::clone(&stop_signal);
     let args2 = args.clone();
+    let mut thread_id_str = "thread-id";
+    if is_server {
+        thread_id_str = "server-thread-id";
+    }
+    let mut command_output_str = "command-output";
+    if is_server {
+        command_output_str = "server-command-output";
+    }
     thread::spawn(move || {
-        let core_path = get_tool_exe_path(String::from("\\easytier\\easytier-core.exe"));
+        let core_path = get_tool_exe_path("\\easytier\\easytier-core.exe");
         // trace, debug, info, warn, error, off
         let mut child = Command::new(&core_path)
             .args(args)
@@ -252,36 +345,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) => {
                     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");
         }
     });
@@ -327,20 +420,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();
-        }
     }
 }
 
@@ -453,7 +543,7 @@ fn autostart_is_enabled() -> bool {
     }
 }
 
-pub const AUTOSTART_ARG: &str = "--autostart";
+// pub const AUTOSTART_ARG: &str = "--autostart";
 pub const TASKAUTOSTART_ARG: &str = "--task-auto-start";
 fn autostart(enabled: bool) -> std::result::Result<(), Box<dyn std::error::Error>> {
     if !enabled {
@@ -521,12 +611,11 @@ fn autostart(enabled: bool) -> std::result::Result<(), Box<dyn std::error::Error
 #[cfg_attr(mobile, tauri::mobile_entry_point)]
 pub fn run() {
     // 获取命令行参数
-    let args: Vec<String> = std::env::args().collect();
+    let _args: Vec<String> = std::env::args().collect();
 
-    let stop_signal = Arc::new(AtomicBool::new(false)); // 创建一个原子布尔值，用于控制命令的停止
-    let stop_signal_clone = Arc::clone(&stop_signal); // 创建一个原子布尔值的克隆，用于传递给命令
     let context = tauri::generate_context!();
     tauri::Builder::default()
+        .plugin(tauri_plugin_cli::init())
         .plugin(
             tauri_plugin_window_state::Builder::new()
                 .with_state_flags(tauri_plugin_window_state::StateFlags::SIZE)
@@ -534,10 +623,6 @@ pub fn run() {
         )
         .plugin(tauri_plugin_clipboard_manager::init())
         .plugin(tauri_plugin_fs::init())
-        .plugin(tauri_plugin_autostart::init(
-            MacosLauncher::LaunchAgent,
-            Some(vec![AUTOSTART_ARG]),
-        ))
         .plugin(tauri_plugin_shell::init())
         .plugin(tauri_plugin_single_instance::init(|app, _args, _cwd| {
             let _ = app
@@ -547,9 +632,9 @@ pub fn run() {
                 .expect("failed to set focus");
         }))
         .setup(move |app| {
-            let args = args.clone();
+            // let args = args.clone();
             // if cfg!(debug_assertions) {
-            let log_path = get_tool_exe_path(String::from("\\easytier\\guiLogs"));
+            let log_path = get_tool_exe_path("\\easytier\\guiLogs");
             app.handle().plugin(
                 tauri_plugin_log::Builder::default()
                     .target(tauri_plugin_log::Target::new(
@@ -584,26 +669,28 @@ pub fn run() {
                 .build(app)?;
 
             // 开机自启隐藏到托盘或者显示主窗口
-            if !args.contains(&String::from(TASKAUTOSTART_ARG)) {
+            // if !args.contains(&String::from(TASKAUTOSTART_ARG)) {
-                let main_window = app.get_webview_window("main").unwrap();
+            //     let main_window = app.get_webview_window("main").unwrap();
-                main_window.show().expect("failed to show window");
+            //     main_window.show().expect("failed to show window");
-                main_window.set_focus().expect("failed to set focus");
+            //     main_window.set_focus().expect("failed to set focus");
-            }
+            // }
 
             Ok(())
         })
-        .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_members_by_cli,
             search_pid_by_pname,
             get_exe_directory,
             spawn_autostart,
-            autostart_is_enabled
+            autostart_is_enabled,
+            prevent_sleep,
+            allow_sleep
         ])
         .run(context)
         .expect("error while running tauri application");

src-tauri/tauri.conf.json

@@ -1,7 +1,7 @@
 {
 	"$schema": "../node_modules/@tauri-apps/cli/config.schema.json",
 	"productName": "easytier-game",
-	"version": "1.2.4",
+	"version": "1.3.1",
 	"identifier": "com.tauri.easytier-game",
 
 	"build": {
@@ -13,7 +13,7 @@
 	"app": {
 		"windows": [
 			{
-				"title": "easytier-game 1.2.4",
+				"title": "easytier-game 1.3.1",
 				"label": "main",
 				"minWidth": 340,
 				"width": 340,
@@ -34,7 +34,17 @@
 			"csp": null
 		}
 	},
-	"plugins": {},
+	"plugins": {
+		"cli": {
+			"description": "easytier game CLI Plugin",
+			"args": [
+				{
+					"name": "task-auto-start",
+					"description": "easytier game autostart"
+				}
+			]
+		}
+	},
 	"bundle": {
 		"active": false,
 		"targets": "all",
@@ -49,7 +59,7 @@
 			"easytier/Packet.dll",
 			"easytier/wintun.dll",
 			"easytier/clear_local_data.bat",
-			"easytier/帮助.txt"
+			"帮助.txt"
 		],
 		"windows": {
 			"webviewInstallMode": {

src-tauri/帮助.txt

@@ -13,4 +13,12 @@
 
 2. 运行easytier-game安装目录下的 easytier/clear_local_data.bat (需要管理员权限) 输入y确认，清除本地存储数据
 
-3. 删除easytierGame文件夹
+3. 删除easytierGame文件夹
+
+
+[没有服务器，怎么自建服务]
+1. 点击 启动联机 按钮旁边的箭头 选择自建服务 设置好端口号后 点击启动服务器
+
+2. 搜索一下 openFrp mossFrp sakurafrp 等 将你的本地服务通过它（们）代理到公网
+
+3. 将代理之后的地址发给别人，他们就可以通过这个加入你的服务了

stores/index.ts

@@ -13,8 +13,11 @@ export default defineStore("main", {
 				autoStart: false, // 是否自动启动
 				connectAfterStart: false, //软件打开后，是否自动连接
 				disableIpv6: false, // 是否禁用IPv6
+				port: "11010", // 监听端口号
+				enableCustomListener: false, // 是否自定义监听
+				customListenerData: "", // 自定义监听地址
 				disbleListenner: false, // 是否禁用监听
-				disableEncryption: false, // 是否禁用加密
+				disableEncryption: true, // 是否禁用加密
 				multiThread: false, //使用多线程
 				enablExitNode: false, // 是否启用退出节点
 				noTun: false, // 是否使用TUN
@@ -28,8 +31,19 @@ export default defineStore("main", {
 				logLevel: "error", //日志等级
 				devName: false, //自定义网卡名
 				devNameValue: "", //自定义网卡名
+				enableCustonProtocol: false, //自定义默认协议
+				customProtocol: "tcp", //自定义默认协议
 				enableNetCardMetric: false, //启用网卡自定义跃点
-				netCardMetricValue: 1 //自定义网卡跃点值
+				netCardMetricValue: 1, //自定义网卡跃点值
+				enablePreventSleep: false, //组织系统休眠
+			},
+			serverConfig: {
+				enableWhiteList: true, // 是否启用白名单
+				relayAllPeerrpc: false, // 是否启用所有对等RPC
+				serverWhiteList: "", // 服务器流量转发白名单
+				// enableListener: true, // 是否启用监听
+				autoStart: false, //随软件自启
+				port: "11010" // 服务器端口
 			},
 			cidrEnable: false,
 			basePeers: ["public.easytier.top:11010"],
@@ -74,6 +88,19 @@ export default defineStore("main", {
 			"config.devNameValue",
 			"config.enableNetCardMetric",
 			"config.netCardMetricValue",
+			"config.port",
+			"config.enableCustomListener",
+			"config.customListenerData",
+			"config.enableCustonProtocol",
+			"config.customProtocol",
+			"config.enablePreventSleep",
+
+			"serverConfig.autoStart",
+			// 'serverConfig.enableListener',
+			"serverConfig.enableWhiteList",
+			"serverConfig.relayAllPeerrpc",
+			"serverConfig.serverWhiteList",
+			"serverConfig.port",
 
 			"cidrEnable",
 			"basePeers",
@@ -83,7 +110,7 @@ export default defineStore("main", {
 			"winIpBcAutoStart",
 			"createConfigInEasytier",
 			"githubFastUrl"
-		],
+		]
 		// // 除了这些，其他都要存下来
 		// omit: ["winipBcPid", "winipBcStart"]
 	}

utils/element.ts

@@ -29,6 +29,8 @@ export const ElConfirmDanger = (
 	}
 	return ATJ(
 		ElMessageBox.confirm(message, title, {
+			closeOnClickModal: false, // 点击遮罩层不关闭弹窗
+			closeOnPressEscape: false, // 按下Esc键不关闭弹窗
 			cancelButtonText,
 			confirmButtonText,
 			confirmButtonClass: "el-button--danger"
@@ -63,6 +65,8 @@ export const ElConfirmSucces = (
 	}
 	return ATJ(
 		ElMessageBox.confirm(message, title, {
+			closeOnClickModal: false, // 点击遮罩层不关闭弹窗
+			closeOnPressEscape: false, // 按下Esc键不关闭弹窗
 			cancelButtonText,
 			confirmButtonText,
 			confirmButtonClass: "el-button--success"
@@ -97,6 +101,8 @@ export const ElConfirmPrimary = (
 	}
 	return ATJ(
 		ElMessageBox.confirm(message, title, {
+			closeOnClickModal: false, // 点击遮罩层不关闭弹窗
+			closeOnPressEscape: false, // 按下Esc键不关闭弹窗
 			cancelButtonText,
 			confirmButtonText,
 			confirmButtonClass: "el-button--primary"

utils/index.ts

@@ -1,3 +1,4 @@
+import { invoke } from "@tauri-apps/api/core";
 import { open } from "@tauri-apps/plugin-shell";
 export const ENV = import.meta.env;
 
@@ -64,7 +65,29 @@ export const ATJ = (promise: Promise<any>, errorExt: string | undefined = undefi
 		});
 };
 
+const _supportProtocols = ["tcp", "udp", "ws", "wss", "quic"];
+
+export const supportProtocols = () => {
+	return _supportProtocols.slice();
+}
+
+let _prevent_timer: NodeJS.Timeout| null = null;
+let _prevent_timer_count = 15; // 秒
+export const preventSleep = () => {
+	_prevent_timer && clearInterval(_prevent_timer);
+	_prevent_timer = setInterval(async () => {
+	    const result = await invoke('prevent_sleep');
+		// console.log(`trigger prevent sleep ${result}`);
+	}, _prevent_timer_count * 1000);
+}
+
+export const stopPreventSleep = () => {
+	_prevent_timer && clearInterval(_prevent_timer);
+	_prevent_timer = null;
+}
+
 export const parsePeerInfo = (content: string) => {
+	if(!content) return [];
 	// 将表格字符串分割成行
 	const lines = content.split("\n");
 

zip.js

@@ -0,0 +1,66 @@
+/**
+ * 生成 release 发布包 zip 文件
+ */
+
+const releaseDir = "./src-tauri/target/release";
+const releaseDirEasytier = `${releaseDir}/easytier/`;
+const releaseExe = `${releaseDir}/easytier-game.exe`;
+const releaseHelp = `${releaseDir}/帮助.txt`;
+const deleteEasytierFiles = ["logs/", "guiLogs/", "cache/"];
+const pkg = require("./package.json");
+const fileName = `easytier-game_windows_x86_64_${pkg.version}.zip`; // 发布包格式
+const releaseZipDir = "./release";
+const releaseZip = `${releaseZipDir}/${fileName}`;
+
+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" })
+	.directory(path.join(__dirname, releaseDirEasytier), "easytier")
+	.finalize();