修复自定义协议勾选后没持久化存储的bug

+ 高级选项 增加2.1.0内核功能 压缩算法和ipv6监听地址
+ 增加服务器地址栏复制按钮
+ 更新内核为最新版本
+ config.json 新增压缩算法配置 可参考 config_template.json

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

app.vue

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

assets/css/main.css

@@ -9,7 +9,9 @@
 		font-family: "Helvetica Neue", "Luxi Sans", "DejaVu Sans", Tahoma, "Hiragino Sans GB", STHeiti, "Microsoft YaHei";
 	}
 } */
-
+html {
+	font-family: "Helvetica Neue",Helvetica,"PingFang SC","Hiragino Sans GB","Microsoft YaHei","微软雅黑",Arial,sans-serif;
+}
 html,
 body {
 	height: 100%;
@@ -47,3 +49,7 @@ html.dark body {
 	overflow: auto;
 	flex: 1;
 }
+
+.el-table {
+	font-size: 12px!important;
+}

components/CoreVersionWarning.vue

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

composables/configJson.ts

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

composables/netcard.ts

@@ -44,7 +44,7 @@ export const handleWinipBcStart = async () => {
 		await getWinIpBroadcastPid();
 		if (mainStore.winipBcPid <= 0) {
 			mainStore.$patch({
-				winIpBcAutoStart: true
+				winIpBcAutoStart: false
 			});
 		}
 	}

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; //没有新版
+}

package.json

@@ -3,7 +3,7 @@
 	"private": true,
 	"author": "leizi97",
 	"description": "A simple network initiator based on Easytier",
-	"version": "1.2.9",
+	"version": "1.3.3",
 	"scripts": {
 		"dev": "nuxt dev --dotenv env/.env.dev --host 0.0.0.0",
 		"build": "nuxt generate --dotenv env/.env.prod",
@@ -13,16 +13,15 @@
 		"@element-plus/icons-vue": "^2.3.1",
 		"@element-plus/nuxt": "^1.1.0",
 		"@nuxtjs/tailwindcss": "^6.12.0",
-		"@pinia/nuxt": "0.8.0",
+		"@pinia/nuxt": "0.9.0",
 		"@tauri-apps/api": "^2.1.1",
 		"@tauri-apps/cli": "^2.1.0",
 		"@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": "12.0.0",
@@ -31,9 +30,11 @@
 		"less": "^4.2.0",
 		"lodash-es": "^4.17.21",
 		"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,9 +1,9 @@
 <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><ElCheckbox v-model="mainStore.config.disableIpv6">不使用IPv6</ElCheckbox></div>
-		<div class="flex items-center gap-[15px] flex-nowrap">
+		<div class="flex flex-nowrap items-center gap-[15px]">
-			<div class="flex items-center gap-[5px] flex-nowrap">
+			<div class="flex flex-nowrap items-center gap-[5px]">
-				<ElCheckbox v-model="mainStore.config.enableCustonProtocol">自定义联机时使用的默认协议</ElCheckbox>
+				<ElCheckbox v-model="mainStore.config.enableCustomProtocol">自定义联机时使用的默认协议</ElCheckbox>
 				<ElTooltip content="如果没有支持该协议的节点地址，程序会自动处理，请放心使用">
 					<ElIcon><QuestionFilled /></ElIcon>
 				</ElTooltip>
@@ -24,7 +24,7 @@
 				</ElSelect>
 			</div>
 		</div>
-		<div class="flex items-center gap-[15px] flex-nowrap">
+		<div class="flex flex-nowrap items-center gap-[15px]">
 			<ElCheckbox v-model="mainStore.config.saveErrorLog">输出日志到本地</ElCheckbox>
 			<div class="w-[140px]">
 				<ElSelect
@@ -49,7 +49,7 @@
 			</ElButton>
 		</div>
 		<div><ElCheckbox v-model="mainStore.config.connectAfterStart">软件启动后，自动"启动联机"(搭配开机自启，无感联机)</ElCheckbox></div>
-		<div class="flex items-center gap-[15px] flex-nowrap">
+		<div class="flex flex-nowrap items-center gap-[15px]">
 			<ElCheckbox v-model="mainStore.createConfigInEasytier">自动生成界面配置文件easytier/config.json</ElCheckbox>
 			<ElButton
 				@click="openConfigJsonDir"
@@ -58,6 +58,7 @@
 				打开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>
@@ -123,6 +124,27 @@
 				</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>
@@ -164,6 +186,27 @@
 		<div><ElCheckbox v-model="mainStore.config.enablExitNode">允许此节点成为出口节点</ElCheckbox></div>
 		<div><ElCheckbox v-model="mainStore.config.disableEncryption">禁用对等节点通信的加密</ElCheckbox></div>
 		<div><ElCheckbox v-model="mainStore.config.multiThread">启用多线程运行</ElCheckbox></div>
+		<div class="flex items-center gap-[10px]">
+			<ElText>压缩算法</ElText>
+			<div class="w-[160px]">
+				<ElSelect
+					size="small"
+					v-model="mainStore.config.compression"
+					placeholder="请选择压缩算法"
+				>
+					<ElOption
+						v-for="item in [
+							['none', '不压缩(游戏联机推荐)'],
+							['zstd', 'zstd算法']
+						]"
+						:key="item[0]"
+						:label="item[1]"
+						:value="item[0]"
+					></ElOption>
+				</ElSelect>
+			</div>
+			<CoreVersionWarning version="2.1.0" />
+		</div>
 		<ElDivider />
 
 		<div><ElCheckbox v-model="mainStore.config.useSmoltcp">为子网代理启用smoltcp堆栈</ElCheckbox></div>
@@ -184,6 +227,7 @@
 	import { reactive } from "vue";
 	import { dataSubscribe } from "@/composables/windows";
 	import { supportProtocols } from "~/utils";
+	import CoreVersionWarning from "@/components/CoreVersionWarning.vue";
 
 	const protocols = supportProtocols();
 	const listenerDialogData = reactive<{ [key: string]: any }>({

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,16 +12,107 @@
 				placeholder="例如: 192.168.1.0/24 一行一个"
 				v-model="mainStore.config.proxyNetworks"
 				type="textarea"
-				:rows="30"
+				:rows="5"
 				resize="none"
 			></ElInput>
+			<ElTable
+				stripe
+				border
+				empty-text="暂无数据"
+				:data="data.route"
+				class="mt-[5px]"
+			>
+				<ElTableColumn
+					sortable
+					width="140"
+					label="主机名"
+					prop="hostname"
+				></ElTableColumn>
+				<ElTableColumn
+					width="120"
+					sortable
+					label="虚拟网IP"
+					prop="ipv4"
+				></ElTableColumn>
+				<ElTableColumn
+					sortable
+					label="被代理的子网"
+					prop="proxy_cidrs"
+				></ElTableColumn>
+			</ElTable>
 		</div>
 	</div>
 </template>
 <script setup lang="ts">
 	import useMainStore from "@/stores/index";
 	import { 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 data = reactive<{ [key: string]: any }>({
+		route: [],
+		isStart: false,
+		isSwitchEnable: false,
+		isRunning: false
+	});
+
+	const listenOutput = async () => {
+		data.isRunning = true;
+		const [error, member] = await ATJ(invoke<string>("get_route_by_cli"));
+		data.isRunning = false;
+		// if(!member) return;
+		if (error) {
+			data.route = [];
+			return "";
+		}
+		if (member === "_EasytierGameCliFailedToConnect_") {
+			data.route = [];
+			await listenOutput();
+			return;
+		}
+		const routeInfo = parseCliInfo(member);
+		routeInfo.forEach(value => {
+			if (value.cost === "Local") {
+				value.cost = "本机";
+			}
+			if (value.ipv4 && value.ipv4.includes("/")) {
+				value.ipv4 = value.ipv4.split("/")[0];
+			}
+		});
+		data.route = routeInfo;
+	};
+
+	const listenStart = async () => {
+		const unListen = await listen<boolean>("route", async event => {
+			data.isStart = event.payload;
+			if (data.isStart) {
+				data.isSwitchEnable = false;
+				if (mainStore.cidrEnable && !data.isRunning) {
+					await listenOutput();
+				} else {
+					data.route = [];
+				}
+			} else {
+				data.isSwitchEnable = true;
+				data.route = [];
+			}
+		});
+		return unListen;
+	};
+
+	let unlistenStart: UnlistenFn | null = null;
+
+	onMounted(async () => {
+		unlistenStart = await listenStart();
+	});
+
+	onBeforeUnmount(() => {
+		unlistenStart && unlistenStart();
+	});
+
 	dataSubscribe(async (...a) => {
 		return { cidrEnable: mainStore.cidrEnable, config: { ...mainStore.config } };
 	});

pages/index.vue

@@ -83,15 +83,34 @@
 					:value="item"
 				>
 					<div class="flex max-w-[calc(100vw-62px)] flex-nowrap items-center gap-[20px] overflow-hidden">
-						<ElTooltip v-if="item && item.length > 30" placement="top" :content="item || '-'">
+						<ElTooltip
+							v-if="item && item.length > 26"
+							placement="top"
+							:content="item || '-'"
+						>
 							<p class="truncate">{{ item }}</p>
 						</ElTooltip>
-						<p v-else class="truncate">{{ item }}</p>
+						<p
+							v-else
+							class="truncate"
+						>
+							{{ item }}
+						</p>
 						<div class="ml-auto flex-shrink-0">
+							<ElButton
+								@click.stop="copyServerUrl(item)"
+								circle
+								size="small"
+								title="复制"
+								:icon="CopyDocument"
+							></ElButton>
+
 							<ElButton
 								@click.stop="handleDeleteServerUrl(item)"
-								round
+								circle
+								size="small"
 								:icon="Delete"
+								title="删除"
 								type="danger"
 							></ElButton>
 						</div>
@@ -310,14 +329,24 @@
 						增强工具
 					</ElButton>
 				</div>
-				<ElLink
+
-					class="ml-[8px] truncate pb-[2px] !text-[9px]"
+				<ElBadge
-					type="info"
+					badge-class="!text-[9px] cursor-pointer"
-					:underline="false"
+					:hidden="!data.hasNewVersion"
-					@click="open('https://github.com/EasyTier/EasytierGame')"
+					:offset="[6, 7]"
+					value="N"
 				>
-					EasytierGame主页
+					<!-- <ElTooltip :disabled="!data.hasNewVersion" content="有新版发布了!"> -->
-				</ElLink>
+					<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>
@@ -343,7 +372,10 @@
 			>
 				刷新
 			</ElButton>
-			<ElTooltip content="打开内核缓存目录">
+			<ElTooltip
+				placement="top"
+				content="打开内核缓存目录"
+			>
 				<ElButton
 					:icon="Folder"
 					size="small"
@@ -507,23 +539,24 @@
 		Tools,
 		MagicStick,
 		SetUp,
-		Folder
+		Folder,
+		CopyDocument
 	} from "@element-plus/icons-vue";
 	import { reactive, onBeforeUnmount, onMounted, ref } from "vue";
-	import { useTray, setTrayRunState, setTrayTooltip } from "~/composables/tray";
+	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 { getCurrentWindow, type Window } from "@tauri-apps/api/window";
-	import { getAllWebviewWindows } from "@tauri-apps/api/webviewWindow";
+	import { getAllWebviewWindows, WebviewWindow } from "@tauri-apps/api/webviewWindow";
 	import etWindows from "@/composables/windows";
 	import { resourceDir as getResourceDir, join } from "@tauri-apps/api/path";
-	import { readDir, exists, mkdir, BaseDirectory, readTextFile } from "@tauri-apps/plugin-fs";
+	import { readDir, exists, mkdir, BaseDirectory, readTextFile, readFile } 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, supportProtocols } from "~/utils";
+	import { bounce, addQQGroup, supportProtocols, preventSleep, stopPreventSleep, ATJ } from "~/utils";
 	import { ElConfirmDanger, ElConfirmPrimary } from "~/utils/element";
 	import { getServerArgs } from "@/composables/server";
 
@@ -548,6 +581,7 @@
 	// console.error(config);
 	const protocols = supportProtocols();
 	const data = reactive<{ [key: string]: any; releaseList: Array<Array<string>> }>({
+		hasNewVersion: false, //easytierGame有没有新版
 		logVisible: false,
 		cidrVisible: false,
 		advanceVisible: false,
@@ -586,13 +620,24 @@
 		data: ""
 	});
 
+	const copyServerUrl = async (serverUrl: string) => {
+		const [err, _] = await ATJ(writeText(serverUrl));
+
+		if (!err) {
+			ElMessage.success("地址已复制");
+		} else {
+			console.error(err);
+			ElMessage.success("复制失败");
+		}
+	};
+
 	const closePrevent = async () => {
 		const appWindow = getCurrentWindow();
 		if (appWindow.label == "main") {
 			appWindow.onCloseRequested(async event => {
 				// console.error(appWindow.label);
 				if (!is_close) {
-					// console.error(1);
+					// console.error(1);s
 					event.preventDefault();
 					appWindow.hide();
 				}
@@ -644,6 +689,17 @@
 		mainStore.basePeers = uniq([mainStore.config.serverUrl, ...mainStore.basePeers]);
 	};
 
+	// 手动触发持久化数据
+	const persist = async (appWindow: Window) => {
+		try {
+			appWindow.emitTo({ kind: "Any" }, "global-main-store", { store: { ...mainStore.$state } });
+			mainStore.$persist();
+		} catch (err) {
+			console.error(err);
+			ElMessage.error("手动持久数据失败");
+		}
+	};
+
 	const listenObj: { [key: string]: any } = {
 		unListenOutPut: null,
 		unListenThreadId: null,
@@ -668,9 +724,9 @@
 							mainStore.config.ipv4 = configIpv4;
 						}
 					}
-					if (event.payload.includes("peer connection removed")) {
+					// if (event.payload.includes("peer connection removed")) {
-						data.isSuccessGetIp = false;
+					// 	data.isSuccessGetIp = false;
-					}
+					// }
 					if (event.payload.includes("new peer connection added") && !data.isSuccessGetIp) {
 						await setTrayRunState(tray, true);
 						data.isSuccessGetIp = true;
@@ -737,15 +793,19 @@
 		async listenConfigStart() {
 			const appWindow = getCurrentWindow();
 			const unListen = await listen("config", event => {
-				// console.error("config", event.payload);
 				const ipv4 = config.ipv4;
 				mainStore.$patch(event.payload as any);
 				config.ipv4 = ipv4;
-				appWindow.emitTo({ kind: "Any" }, "global-main-store", { store: { ...mainStore.$state } });
+				if (mainStore.config.enablePreventSleep) {
+					preventSleep();
+				} else {
+					stopPreventSleep();
+				}
+				persist(appWindow);
 			});
 			const unListen2 = mainStore.$subscribe(() => {
-				appWindow.emitTo({ kind: "Any" }, "global-main-store", { store: { ...mainStore.$state } });
+				persist(appWindow);
-			})
+			});
 			this.unListenConfigStart = [unListen, unListen2];
 		},
 		async listenStartStopServer() {
@@ -795,7 +855,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(`当前版本无需安装`);
@@ -885,9 +945,11 @@
 		const path = import.meta.env.VITE_CONFIG_FILE_NAME;
 		const isExists = await exists(path, { baseDir: BaseDirectory.Resource });
 		if (isExists) {
-			const guiJsonStr = await readTextFile(path, { baseDir: BaseDirectory.Resource });
+			const guiJsonStrUint8 = await readFile(path, { baseDir: BaseDirectory.Resource });
-			if (guiJsonStr) {
+			if (guiJsonStrUint8) {
 				try {
+					const decoder = new TextDecoder("utf-8");
+					const guiJsonStr = decoder.decode(guiJsonStrUint8);
 					const regex = /^(\s*\/\/.*)/gm;
 					const regex2 = /(,?)\s*\/\/.*(?=\n|$|\r\n)/gm;
 					const resultStr = guiJsonStr.replace(regex, "").replace(regex2, "$1");
@@ -917,7 +979,7 @@
 					}
 				} catch (err) {
 					console.error(err);
-					ElMessage.error(`config.json格式错误`);
+					ElMessage.error(`config.json格式或编码错误`);
 				} finally {
 					mainStore.$patch({
 						createConfigInEasytier: true // 发现本地存在config.json 默认启用该功能
@@ -949,6 +1011,12 @@
 		}
 	};
 
+	const initPreventSleep = async () => {
+		if (mainStore.config.enablePreventSleep) {
+			preventSleep();
+		}
+	};
+
 	const mountedShow = async () => {
 		const args = await getMatches();
 		if (!args.args?.["task-auto-start"]?.value) {
@@ -960,6 +1028,7 @@
 
 	let logsTimer: NodeJS.Timeout | null = null;
 	let serverLogsTimer: NodeJS.Timeout | null = null;
+	let cidrTimer: NodeJS.Timeout | null = null;
 
 	onMounted(async () => {
 		await initGuiJson();
@@ -974,8 +1043,10 @@
 		await initConfigDir();
 		await initAutoStartServer();
 		await initConnectAfterStart();
+		initPreventSleep();
 		mountedShow(); // 不需要await
 		closePrevent();
+		data.hasNewVersion = await checkNewVersion();
 	});
 
 	onBeforeUnmount(() => {
@@ -986,6 +1057,8 @@
 		listenObj.unListenStartStopServer && listenObj.unListenStartStopServer();
 		logsTimer && clearInterval(logsTimer);
 		serverLogsTimer && clearInterval(serverLogsTimer);
+		cidrTimer && clearInterval(cidrTimer);
+		stopPreventSleep();
 	});
 
 	const getArgs = async () => {
@@ -1031,13 +1104,13 @@
 			args.push("--network-secret", config.networkPassword);
 		}
 		if (config.ipv4) {
-			args.push("--ipv4", config.ipv4);
+			args.push("--ipv4", config.ipv4.trim());
 		}
 		if (config.serverUrl) {
 			const formatUrl = config.serverUrl.replace(/\\/g, "/");
 			args.push("--peers", ...config.protocol.map(protocol => `${protocol}://${formatUrl}`));
 		}
-		if (config.enableCustonProtocol) {
+		if (config.enableCustomProtocol) {
 			const includes = config.protocol.includes(config.customProtocol);
 			if (includes) {
 				args.push("--default-protocol", config.customProtocol);
@@ -1062,17 +1135,22 @@
 				args.push("-l", ...customListener);
 			}
 		}
+		if (!config.disbleListenner && config.enableCustomListenerV6 && config.customListenerV6Data){
+			args.push("--ipv6-listener", config.customListenerV6Data)
+		}
 		if (!config.disbleListenner && !config.enableCustomListener && config.port) {
 			args.push("-l", config.port);
 		}
 		if (mainStore.cidrEnable && config.proxyNetworks) {
-			// console.error(config.proxyNetworks);
+			let formatProxyNetworks = config.proxyNetworks.trim().split("\n");
-			const reg = /\d+\.\d+\.\d+\.\d+\/\d+/g;
+			const newformatProxyNetworks = formatProxyNetworks
-			const formatProxyNetworks = config.proxyNetworks
+				.map(el => el.trim())
-				.split("\n")
+				.filter(cidr => {
-				.map(item => item.trim())
+					return /^\d+\.\d+\.\d+\.\d+\/\d+$/g.test(cidr);
-				.filter(item => item && reg.test(item));
+				});
-			args.push("--proxy-networks", ...formatProxyNetworks);
+			if (newformatProxyNetworks.length > 0) {
+				args.push("--proxy-networks", ...newformatProxyNetworks);
+			}
 			config.proxyNetworks = formatProxyNetworks.join("\n");
 		}
 		if (config.disableEncryption) {
@@ -1105,6 +1183,9 @@
 		if (config.devName && config.devNameValue) {
 			args.push("--dev-name", config.devNameValue);
 		}
+		if(config.compression && config.compression != 'none') {
+			args.push("--compression", config.compression);
+		}
 		return args;
 	};
 
@@ -1150,7 +1231,6 @@
 			data.startLoading = true;
 			await unListenAll();
 			await listenObj.listenOutput();
-
 			await invoke("run_command", {
 				args
 			});
@@ -1317,8 +1397,13 @@
 			},
 			(_, appWindow) => {
 				data.cidrVisible = true;
+				cidrTimer && clearInterval(cidrTimer);
+				cidrTimer = setInterval(() => {
+					appWindow.emitTo({ kind: "WebviewWindow", label: "cidr" }, "route", data.isStart);
+				}, 1000);
 			},
 			() => {
+				cidrTimer && clearInterval(cidrTimer);
 				data.cidrVisible = false;
 			}
 		);

pages/log.vue

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

pages/member.vue

@@ -1,7 +1,12 @@
 <template>
-	<div class="overflow-auto h-full">
+	<div class="h-full overflow-auto">
 		<div class="w-[1200px]">
-			<span v-if="!data.member || data.member.length <= 0">{{ "等待成员信息中..." }}</span>
+			<ElText
+				size="small"
+				v-if="!data.member || data.member.length <= 0"
+			>
+				{{ "等待成员信息中..." }}
+			</ElText>
 			<ElTable
 				stripe
 				border
@@ -14,22 +19,27 @@
 					label="主机名"
 					prop="hostname"
 				>
-					<template #default="{row}">
+					<template #default="{ row }">
-						{{ (row.hostname || "").toLowerCase().includes('publicserver') ? (row.hostname || "").replace("PublicServer", "服务器") : (row.hostname || "-") }}
+						{{
+							(row.hostname || "").toLowerCase().includes("publicserver")
+								? (row.hostname || "").replace("PublicServer", "服务器")
+								: row.hostname || "-"
+						}}
 					</template>
 				</ElTableColumn>
 				<ElTableColumn
 					sortable
 					width="90"
 					prop="cost"
-					label="路由"
+					label="方式"
 				>
 					<template #default="{ row }">
 						<ElTag
+							size="small"
 							effect="dark"
 							:type="row.cost == 'p2p' ? 'success' : 'info'"
 						>
-							{{ row.cost }}
+							{{ row.cost ? row.cost.replace("relay", "中转") : row.cost }}
 						</ElTag>
 					</template>
 				</ElTableColumn>
@@ -42,12 +52,12 @@
 				<ElTableColumn
 					sortable
 					prop="lat_ms"
-					width="130"
+					width="100"
 					label="延迟/ms"
 				></ElTableColumn>
 				<ElTableColumn
 					sortable
-					width="120"
+					width="100"
 					prop="loss_rate"
 					label="丢包率"
 				>
@@ -57,7 +67,7 @@
 				</ElTableColumn>
 				<ElTableColumn
 					sortable
-					width="120"
+					width="110"
 					label="NAT类型"
 					prop="nat_type"
 				>
@@ -67,17 +77,19 @@
 				</ElTableColumn>
 				<ElTableColumn
 					sortable
-					width="120"
+					width="122"
 					prop="version"
 					label="版本"
 				></ElTableColumn>
 				<ElTableColumn
 					sortable
+					width="100"
 					prop="tunnel_proto"
 					label="隧道协议"
 				></ElTableColumn>
 				<ElTableColumn
 					sortable
+					width="90"
 					prop="rx_bytes"
 					label="接收"
 				></ElTableColumn>
@@ -93,9 +105,9 @@
 <script setup lang="ts">
 	import { invoke } from "@tauri-apps/api/core";
 	import { reactive, onMounted, onBeforeUnmount } from "vue";
-	import { ATJ, parsePeerInfo } from "@/utils";
+	import { ATJ, parseCliInfo } from "@/utils";
 	import { ElConfirmDanger } from "~/utils/element";
-import { getCurrentWindow } from "@tauri-apps/api/window";
+	import { getCurrentWindow } from "@tauri-apps/api/window";
 	// 	enum NatType {
 	//   // has NAT; but own a single public IP, port is not changed
 	//   Unknown = 0;
@@ -123,7 +135,7 @@ import { getCurrentWindow } from "@tauri-apps/api/window";
 	};
 	type natKyes = keyof typeof natMaps;
 
-	const data = reactive<{ member: {hostname: string, cost: string, ipv4: string, lat_msg: string, loss_rate: string, nat_type: string}[] }>({
+	const data = reactive<{ member: { hostname: string; cost: string; ipv4: string; lat_msg: string; loss_rate: string; nat_type: string }[] }>({
 		member: []
 	});
 
@@ -136,8 +148,8 @@ import { getCurrentWindow } from "@tauri-apps/api/window";
 		["nat_type", "NAT类型"],
 		["version", "版本"],
 		["tunnel_proto", "隧道协议"],
-		['rx_bytes', '接收'],
+		["rx_bytes", "接收"],
-		['tx_bytes', '传输']
+		["tx_bytes", "传输"]
 	];
 
 	let timer: NodeJS.Timeout | null = null;
@@ -164,7 +176,7 @@ import { getCurrentWindow } from "@tauri-apps/api/window";
 			}
 			return;
 		}
-		const peerInfo = parsePeerInfo(member);
+		const peerInfo = parseCliInfo(member);
 		peerInfo.forEach(value => {
 			if (value.cost === "Local") {
 				value.cost = "本机";
@@ -188,7 +200,7 @@ import { getCurrentWindow } from "@tauri-apps/api/window";
 	const stopTimer = () => {
 		timer && clearTimeout(timer);
 		timer = null;
-	}
+	};
 
 	onMounted(async () => {
 		await listenOutput();

pnpm-lock.yaml

@@ -18,8 +18,8 @@ importers:
         specifier: ^6.12.0
         version: 6.12.2(magicast@0.3.5)(rollup@4.25.0)
       '@pinia/nuxt':
-        specifier: 0.8.0
+        specifier: 0.9.0
-        version: 0.8.0(magicast@0.3.5)(pinia@2.2.6(typescript@5.6.3)(vue@3.5.13(typescript@5.6.3)))(rollup@4.25.0)
+        version: 0.9.0(magicast@0.3.5)(pinia@2.3.0(typescript@5.6.3)(vue@3.5.13(typescript@5.6.3)))(rollup@4.25.0)
       '@tauri-apps/api':
         specifier: ^2.1.1
         version: 2.1.1
@@ -33,20 +33,17 @@ importers:
         specifier: ^2.0.0
         version: 2.0.0
       '@tauri-apps/plugin-fs':
-        specifier: ~2
+        specifier: ^2.2.0
-        version: 2.0.2
+        version: 2.2.0
-      '@tauri-apps/plugin-http':
-        specifier: ^2.0.1
-        version: 2.0.1
       '@tauri-apps/plugin-log':
-        specifier: ^2.0.0
+        specifier: ^2.2.0
-        version: 2.0.0
+        version: 2.2.0
       '@tauri-apps/plugin-shell':
-        specifier: ~2
+        specifier: ^2.2.0
-        version: 2.0.1
+        version: 2.2.0
       '@tauri-apps/plugin-window-state':
-        specifier: ~2
+        specifier: ^2.2.0
-        version: 2.0.0
+        version: 2.2.0
       '@types/lodash-es':
         specifier: ^4.17.12
         version: 4.17.12
@@ -72,14 +69,20 @@ importers:
         specifier: ^3.14.1592
         version: 3.14.1592(@parcel/watcher@2.5.0)(@types/node@22.9.0)(ioredis@5.4.1)(less@4.2.0)(magicast@0.3.5)(rollup@4.25.0)(terser@5.36.0)(typescript@5.6.3)(vite@5.4.11(@types/node@22.9.0)(less@4.2.0)(terser@5.36.0))
       pinia:
-        specifier: ^2.2.6
+        specifier: ^2.3.0
-        version: 2.2.6(typescript@5.6.3)(vue@3.5.13(typescript@5.6.3))
+        version: 2.3.0(typescript@5.6.3)(vue@3.5.13(typescript@5.6.3))
       pinia-plugin-persistedstate:
         specifier: ^4.1.3
-        version: 4.1.3(@pinia/nuxt@0.8.0(magicast@0.3.5)(pinia@2.2.6(typescript@5.6.3)(vue@3.5.13(typescript@5.6.3)))(rollup@4.25.0))(magicast@0.3.5)(pinia@2.2.6(typescript@5.6.3)(vue@3.5.13(typescript@5.6.3)))(rollup@4.25.0)
+        version: 4.1.3(@pinia/nuxt@0.9.0(magicast@0.3.5)(pinia@2.3.0(typescript@5.6.3)(vue@3.5.13(typescript@5.6.3)))(rollup@4.25.0))(magicast@0.3.5)(pinia@2.3.0(typescript@5.6.3)(vue@3.5.13(typescript@5.6.3)))(rollup@4.25.0)
       postcss:
         specifier: ^8.4.38
         version: 8.4.49
+      prettier:
+        specifier: ^3.4.1
+        version: 3.4.1
+      prettier-plugin-tailwindcss:
+        specifier: ^0.6.9
+        version: 0.6.9(prettier@3.4.1)
       typescript:
         specifier: ^5.6.3
         version: 5.6.3
@@ -769,10 +772,10 @@ packages:
     resolution: {integrity: sha512-i0GV1yJnm2n3Yq1qw6QrUrd/LI9bE8WEBOTtOkpCXHHdyN3TAGgqAK/DAT05z4fq2x04cARXt2pDmjWjL92iTQ==}
     engines: {node: '>= 10.0.0'}
 
-  '@pinia/nuxt@0.8.0':
+  '@pinia/nuxt@0.9.0':
-    resolution: {integrity: sha512-BWPUKOg3KGnRSgz54x9IUzCKTqUxZx4UJezPRbRwY5BVt18rfiP4Cqq8kxtR8WWDZa5PTRJpx0Jxz+qyUdLvjQ==}
+    resolution: {integrity: sha512-2yeRo7LeyCF68AbNeL3xu2h6uw0617RkcsYxmA8DJM0R0PMdz5wQHnc44KeENQxR/Mrq8T910XVT6buosqsjBQ==}
     peerDependencies:
-      pinia: ^2.2.7
+      pinia: ^2.3.0
 
   '@pkgjs/parseargs@0.11.0':
     resolution: {integrity: sha512-+1VkjdD0QBLPodGrJUeqarH8VAIvQODIbwh9XpP5Syisf7YoQgsJKPNFoqqLQlu+VQ/tVSshMR6loPMn8U+dPg==}
@@ -1150,20 +1153,17 @@ packages:
   '@tauri-apps/plugin-clipboard-manager@2.0.0':
     resolution: {integrity: sha512-V1sXmbjnwfXt/r48RJMwfUmDMSaP/8/YbH4CLNxt+/sf1eHlIP8PRFdFDQwLN0cNQKu2rqQVbG/Wc/Ps6cDUhw==}
 
-  '@tauri-apps/plugin-fs@2.0.2':
+  '@tauri-apps/plugin-fs@2.2.0':
-    resolution: {integrity: sha512-4YZaX2j7ta81M5/DL8aN10kTnpUkEpkPo1FTYPT8Dd0ImHe3azM8i8MrtjrDGoyBYLPO3zFv7df/mSCYF8oA0Q==}
+    resolution: {integrity: sha512-+08mApuONKI8/sCNEZ6AR8vf5vI9DXD4YfrQ9NQmhRxYKMLVhRW164vdW5BSLmMpuevftpQ2FVoL9EFkfG9Z+g==}
 
-  '@tauri-apps/plugin-http@2.0.1':
+  '@tauri-apps/plugin-log@2.2.0':
-    resolution: {integrity: sha512-j6IA3pVBybSCwPpsihpX4z8bs6PluuGtr06ahL/xy4D8HunNBTmRmadJrFOQi0gOAbaig4MkQ15nzNLBLy8R1A==}
+    resolution: {integrity: sha512-g6CsQAR1lsm5ABSZZxpM/iCn86GrMDTTlhj7GPkZkYBRSm3+WczfOAl7SV7HDn77tOKCzhZffwI5uHfRoHutrw==}
 
-  '@tauri-apps/plugin-log@2.0.0':
+  '@tauri-apps/plugin-shell@2.2.0':
-    resolution: {integrity: sha512-C+NII9vzswqnOQE8k7oRtnaw0z5TZsMmnirRhXkCKDEhQQH9841Us/PC1WHtGiAaJ8za1A1JB2xXndEq/47X/w==}
+    resolution: {integrity: sha512-iC3Ic1hLmasoboG7BO+7p+AriSoqAwKrIk+Hpk+S/bjTQdXqbl2GbdclghI4gM32X0bls7xHzIFqhRdrlvJeaA==}
 
-  '@tauri-apps/plugin-shell@2.0.1':
+  '@tauri-apps/plugin-window-state@2.2.0':
-    resolution: {integrity: sha512-akU1b77sw3qHiynrK0s930y8zKmcdrSD60htjH+mFZqv5WaakZA/XxHR3/sF1nNv9Mgmt/Shls37HwnOr00aSw==}
+    resolution: {integrity: sha512-PFZ/vkZ6UPaRyuggEn8jWc/xwpiEw3Id8i6bin54zUR3vHY0MOK+ovvpvp6SEHKryCJbZMigYJz0OUT2eZ4YmQ==}
-
-  '@tauri-apps/plugin-window-state@2.0.0':
-    resolution: {integrity: sha512-O82iRlrh1BLgBI8CTc+NMTPxQhQo8II5admKq9mLvH45Us5i4Zcr74At6eM46nOflFd7R8bZsVNGy+PxOEqUmQ==}
 
   '@trysound/sax@0.2.0':
     resolution: {integrity: sha512-L7z9BgrNEcYyUYtF+HaEfiS5ebkh9jXqbszz7pC0hRBPaatV0XjSD3+eHrpqFemQfgwiFF0QPIarnIihIDn7OA==}
@@ -2885,15 +2885,12 @@ packages:
       pinia:
         optional: true
 
-  pinia@2.2.6:
+  pinia@2.3.0:
-    resolution: {integrity: sha512-vIsR8JkDN5Ga2vAxqOE2cJj4VtsHnzpR1Fz30kClxlh0yCHfec6uoMeM3e/ddqmwFUejK3NlrcQa/shnpyT4hA==}
+    resolution: {integrity: sha512-ohZj3jla0LL0OH5PlLTDMzqKiVw2XARmC1XYLdLWIPBMdhDW/123ZWr4zVAhtJm+aoSkFa13pYXskAvAscIkhQ==}
     peerDependencies:
-      '@vue/composition-api': ^1.4.0
       typescript: '>=4.4.4'
-      vue: ^2.6.14 || ^3.5.11
+      vue: ^2.7.0 || ^3.5.11
     peerDependenciesMeta:
-      '@vue/composition-api':
-        optional: true
       typescript:
         optional: true
 
@@ -3125,6 +3122,66 @@ packages:
     resolution: {integrity: sha512-OCVPnIObs4N29kxTjzLfUryOkvZEq+pf8jTF0lg8E7uETuWHA+v7j3c/xJmiqpX450191LlmZfUKkXxkTry7nA==}
     engines: {node: ^10 || ^12 || >=14}
 
+  prettier-plugin-tailwindcss@0.6.9:
+    resolution: {integrity: sha512-r0i3uhaZAXYP0At5xGfJH876W3HHGHDp+LCRUJrs57PBeQ6mYHMwr25KH8NPX44F2yGTvdnH7OqCshlQx183Eg==}
+    engines: {node: '>=14.21.3'}
+    peerDependencies:
+      '@ianvs/prettier-plugin-sort-imports': '*'
+      '@prettier/plugin-pug': '*'
+      '@shopify/prettier-plugin-liquid': '*'
+      '@trivago/prettier-plugin-sort-imports': '*'
+      '@zackad/prettier-plugin-twig-melody': '*'
+      prettier: ^3.0
+      prettier-plugin-astro: '*'
+      prettier-plugin-css-order: '*'
+      prettier-plugin-import-sort: '*'
+      prettier-plugin-jsdoc: '*'
+      prettier-plugin-marko: '*'
+      prettier-plugin-multiline-arrays: '*'
+      prettier-plugin-organize-attributes: '*'
+      prettier-plugin-organize-imports: '*'
+      prettier-plugin-sort-imports: '*'
+      prettier-plugin-style-order: '*'
+      prettier-plugin-svelte: '*'
+    peerDependenciesMeta:
+      '@ianvs/prettier-plugin-sort-imports':
+        optional: true
+      '@prettier/plugin-pug':
+        optional: true
+      '@shopify/prettier-plugin-liquid':
+        optional: true
+      '@trivago/prettier-plugin-sort-imports':
+        optional: true
+      '@zackad/prettier-plugin-twig-melody':
+        optional: true
+      prettier-plugin-astro:
+        optional: true
+      prettier-plugin-css-order:
+        optional: true
+      prettier-plugin-import-sort:
+        optional: true
+      prettier-plugin-jsdoc:
+        optional: true
+      prettier-plugin-marko:
+        optional: true
+      prettier-plugin-multiline-arrays:
+        optional: true
+      prettier-plugin-organize-attributes:
+        optional: true
+      prettier-plugin-organize-imports:
+        optional: true
+      prettier-plugin-sort-imports:
+        optional: true
+      prettier-plugin-style-order:
+        optional: true
+      prettier-plugin-svelte:
+        optional: true
+
+  prettier@3.4.1:
+    resolution: {integrity: sha512-G+YdqtITVZmOJje6QkXQWzl3fSfMxFwm1tjTyo9exhkmWSqC4Yhd1+lug++IlR2mvRVAxEDDWYkQdeSztajqgg==}
+    engines: {node: '>=14'}
+    hasBin: true
+
   pretty-bytes@6.1.1:
     resolution: {integrity: sha512-mQUvGU6aUFQ+rNvTIAcZuWGRT9a6f6Yrg9bHs4ImKF+HZCEK+plBvnAZYSIQztknZF2qnzNtr6F8s0+IuptdlQ==}
     engines: {node: ^14.13.1 || >=16.0.0}
@@ -4720,10 +4777,10 @@ snapshots:
       '@parcel/watcher-win32-ia32': 2.5.0
       '@parcel/watcher-win32-x64': 2.5.0
 
-  '@pinia/nuxt@0.8.0(magicast@0.3.5)(pinia@2.2.6(typescript@5.6.3)(vue@3.5.13(typescript@5.6.3)))(rollup@4.25.0)':
+  '@pinia/nuxt@0.9.0(magicast@0.3.5)(pinia@2.3.0(typescript@5.6.3)(vue@3.5.13(typescript@5.6.3)))(rollup@4.25.0)':
     dependencies:
       '@nuxt/kit': 3.14.1592(magicast@0.3.5)(rollup@4.25.0)
-      pinia: 2.2.6(typescript@5.6.3)(vue@3.5.13(typescript@5.6.3))
+      pinia: 2.3.0(typescript@5.6.3)(vue@3.5.13(typescript@5.6.3))
     transitivePeerDependencies:
       - magicast
       - rollup
@@ -4993,23 +5050,19 @@ snapshots:
     dependencies:
       '@tauri-apps/api': 2.1.1
 
-  '@tauri-apps/plugin-fs@2.0.2':
+  '@tauri-apps/plugin-fs@2.2.0':
     dependencies:
       '@tauri-apps/api': 2.1.1
 
-  '@tauri-apps/plugin-http@2.0.1':
+  '@tauri-apps/plugin-log@2.2.0':
     dependencies:
       '@tauri-apps/api': 2.1.1
 
-  '@tauri-apps/plugin-log@2.0.0':
+  '@tauri-apps/plugin-shell@2.2.0':
     dependencies:
       '@tauri-apps/api': 2.1.1
 
-  '@tauri-apps/plugin-shell@2.0.1':
+  '@tauri-apps/plugin-window-state@2.2.0':
-    dependencies:
-      '@tauri-apps/api': 2.1.1
-
-  '@tauri-apps/plugin-window-state@2.0.0':
     dependencies:
       '@tauri-apps/api': 2.1.1
 
@@ -7018,28 +7071,30 @@ snapshots:
   pify@4.0.1:
     optional: true
 
-  pinia-plugin-persistedstate@4.1.3(@pinia/nuxt@0.8.0(magicast@0.3.5)(pinia@2.2.6(typescript@5.6.3)(vue@3.5.13(typescript@5.6.3)))(rollup@4.25.0))(magicast@0.3.5)(pinia@2.2.6(typescript@5.6.3)(vue@3.5.13(typescript@5.6.3)))(rollup@4.25.0):
+  pinia-plugin-persistedstate@4.1.3(@pinia/nuxt@0.9.0(magicast@0.3.5)(pinia@2.3.0(typescript@5.6.3)(vue@3.5.13(typescript@5.6.3)))(rollup@4.25.0))(magicast@0.3.5)(pinia@2.3.0(typescript@5.6.3)(vue@3.5.13(typescript@5.6.3)))(rollup@4.25.0):
     dependencies:
       '@nuxt/kit': 3.14.159(magicast@0.3.5)(rollup@4.25.0)
       deep-pick-omit: 1.2.1
       defu: 6.1.4
       destr: 2.0.3
     optionalDependencies:
-      '@pinia/nuxt': 0.8.0(magicast@0.3.5)(pinia@2.2.6(typescript@5.6.3)(vue@3.5.13(typescript@5.6.3)))(rollup@4.25.0)
+      '@pinia/nuxt': 0.9.0(magicast@0.3.5)(pinia@2.3.0(typescript@5.6.3)(vue@3.5.13(typescript@5.6.3)))(rollup@4.25.0)
-      pinia: 2.2.6(typescript@5.6.3)(vue@3.5.13(typescript@5.6.3))
+      pinia: 2.3.0(typescript@5.6.3)(vue@3.5.13(typescript@5.6.3))
     transitivePeerDependencies:
       - magicast
       - rollup
       - supports-color
       - webpack-sources
 
-  pinia@2.2.6(typescript@5.6.3)(vue@3.5.13(typescript@5.6.3)):
+  pinia@2.3.0(typescript@5.6.3)(vue@3.5.13(typescript@5.6.3)):
     dependencies:
       '@vue/devtools-api': 6.6.4
       vue: 3.5.13(typescript@5.6.3)
       vue-demi: 0.14.10(vue@3.5.13(typescript@5.6.3))
     optionalDependencies:
       typescript: 5.6.3
+    transitivePeerDependencies:
+      - '@vue/composition-api'
 
   pirates@4.0.6: {}
 
@@ -7257,6 +7312,12 @@ snapshots:
       picocolors: 1.1.1
       source-map-js: 1.2.1
 
+  prettier-plugin-tailwindcss@0.6.9(prettier@3.4.1):
+    dependencies:
+      prettier: 3.4.1
+
+  prettier@3.4.1: {}
+
   pretty-bytes@6.1.1: {}
 
   process-nextick-args@2.0.1: {}

src-tauri/Cargo.lock

@@ -1227,10 +1227,11 @@ checksum = "0d6ef0072f8a535281e4876be788938b528e9a1d43900b82c2569af7da799125"
 
 [[package]]
 name = "easytier-game"
-version = "1.2.9"
+version = "1.3.3"
 dependencies = [
  "log",
  "planif",
+ "rand 0.8.5",
  "reqwest",
  "serde",
  "serde_json",

src-tauri/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "easytier-game"
-version = "1.2.9"
+version = "1.3.3"
 homepage = "https://github.com/EasyTier/EasyTier"
 repository = "https://github.com/EasyTier/EasytierGame"
 description = "A simple network initiator based on Easytier"
@@ -34,12 +34,13 @@ 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"
+rand = "0.8.5"
 tokio = { version = "1.41.1", features = ["process"] }
 # prost = "0.13"
 # prost-types = "0.13"
@@ -47,7 +48,7 @@ tokio = { version = "1.41.1", features = ["process"] }
 
 [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-cli = "2"

src-tauri/capabilities/default.json

@@ -14,6 +14,7 @@
   "permissions": [
     "core:default",
     "core:window:allow-minimize",
+    "core:window:allow-unminimize",
     "core:window:allow-hide",
     "core:window:allow-close",
     "core:window:allow-set-focus",

src-tauri/src/lib.rs

@@ -20,7 +20,52 @@ 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;
+use rand::Rng;
+
+fn generate_random_user_agent() -> String {
+    let user_agents = vec![
+        "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/{version} Safari/537.36",
+        "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/{version} Safari/605.1.15",
+        "Mozilla/5.0 (iPhone; CPU iPhone OS 14_0 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/{version} Mobile/15E148 Safari/604.1",
+        "Mozilla/5.0 (Linux; Android 10; SM-G973F) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/{version} Mobile Safari/537.36",
+        "Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:{version}) Gecko/20100101 Firefox/{version}",
+    ];
+
+    let mut rng = rand::thread_rng();
+    let template = user_agents[rng.gen_range(0..user_agents.len())];
+
+    // 生成随机版本号
+    let version_major: u8 = rng.gen_range(70..90);
+    let version_minor: u8 = rng.gen_range(0..10);
+    let version_patch: u8 = rng.gen_range(0..10);
+    let version = format!("{}.{}.{}", version_major, version_minor, version_patch);
+
+    // 替换模板中的版本号占位符
+    template.replace("{version}", &version)
+}
+
+#[tauri::command(rename_all = "snake_case")]
+fn prevent_sleep() -> bool {
+    unsafe {
+        let result =
+            SetThreadExecutionState(ES_SYSTEM_REQUIRED | ES_DISPLAY_REQUIRED | ES_CONTINUOUS);
+        result != EXECUTION_STATE(0)
+    }
+}
+
+#[tauri::command(rename_all = "snake_case")]
+fn allow_sleep() -> bool {
+    unsafe {
+        let result = SetThreadExecutionState(ES_CONTINUOUS);
+        result != EXECUTION_STATE(0)
+    }
+}
 
 // 定义GitHub Release的结构体
 #[derive(Debug, Deserialize)]
@@ -45,20 +90,61 @@ pub async fn fetch_releases() -> Result<Vec<Release>, Error> {
     let client = Client::new();
     // 构建请求的URL
     let url = format!("https://api.github.com/repos/easytier/easytier/releases",);
-
+    let user_agent = generate_random_user_agent();
     // 发送HTTP GET请求
     let response = client
         .get(&url)
-        .header("User-Agent", "Tauri-fetch")
+        .header("User-Agent", user_agent)
         .send()
         .await?;
     // 反序列化响应体为Release列表
     response.json::<Vec<Release>>().await
 }
 
+#[tauri::command(rename_all = "snake_case")]
+async fn fetch_game_releases() -> [String; 2] {
+    // 创建HTTP客户端
+    let client = Client::new();
+    // 构建请求的URL
+    let url = format!("https://api.github.com/repos/Easytier/EasytierGame/releases",);
+    let user_agent = generate_random_user_agent();
+    // 发送HTTP GET请求
+    if let Ok(response) = client
+        .get(&url)
+        .header("User-Agent", user_agent)
+        .send()
+        .await
+    {
+        // 反序列化响应体为Release列表
+        match response.json::<Vec<Release>>().await {
+            Ok(releases) => {
+                if releases.len() <= 0 {
+                    return [String::from(""), String::from("")];
+                }
+                let release = releases.first().unwrap();
+                let tag_name = release.tag_name.as_str();
+                let browser_download_url = release
+                    .assets
+                    .first()
+                    .unwrap()
+                    .browser_download_url
+                    .as_str();
+                [String::from(tag_name), String::from(browser_download_url)]
+            }
+            Err(_e) => {
+                log::error!("game release {}", _e.to_string());
+                [String::from(""), String::from("")]
+            }
+        }
+    } else {
+        log::error!("failed to get game release");
+        [String::from(""), String::from("")]
+    }
+}
+
 #[tauri::command(rename_all = "snake_case")]
 fn get_core_version() -> String {
-    let core_path = get_tool_exe_path(String::from("\\easytier\\easytier-core.exe"));
+    let core_path = get_tool_exe_path("\\easytier\\easytier-core.exe");
     match Command::new(&core_path)
         .arg("--version")
         .creation_flags(0x08000000)
@@ -78,7 +164,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)
@@ -92,9 +178,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;
 }
 
@@ -132,7 +219,7 @@ struct MyResponse {
 
 #[tauri::command(rename_all = "snake_case")]
 async fn get_members_by_cli() -> String {
-    let cli_path = get_tool_exe_path(String::from("\\easytier\\easytier-cli.exe"));
+    let cli_path = get_tool_exe_path("\\easytier\\easytier-cli.exe");
     match tokioCommand::new(&cli_path)
         .arg("peer")
         .arg("list")
@@ -157,9 +244,35 @@ async fn get_members_by_cli() -> String {
     }
 }
 
+#[tauri::command(rename_all = "snake_case")]
+async fn get_route_by_cli() -> String {
+    let cli_path = get_tool_exe_path("\\easytier\\easytier-cli.exe");
+    match tokioCommand::new(&cli_path)
+        .arg("route")
+        .creation_flags(0x08000000)
+        .output()
+        .await
+    {
+        Ok(output) => {
+            if output.status.success() {
+                let output_str = String::from_utf8_lossy(&output.stdout);
+                return output_str.trim().to_string();
+            } else {
+                let output_str = String::from_utf8_lossy(&output.stderr);
+                log::error!("{}", output_str.trim().to_string());
+                return "_EasytierGameCliFailedToConnect_".to_string();
+            }
+        }
+        Err(_e) => {
+            log::error!("get route list error");
+            return "".to_string();
+        }
+    }
+}
+
 #[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(String::from("\\easytier\\cache"));
+    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() {
@@ -171,7 +284,7 @@ async fn download_easytier_zip(download_url: String, file_name: String) {
     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);
 
@@ -238,7 +351,7 @@ fn unzip(fname: &path::Path) {
         //         fs::create_dir_all(p).unwrap();
         //     }
         // }
-        let easytier_path = get_tool_exe_path(String::from("\\easytier"));
+        let easytier_path = get_tool_exe_path("\\easytier");
         let easytier_dir = path::Path::new(&easytier_path);
         // if !easytier_dir.exists() {
         //     fs::create_dir_all(&easytier_dir).unwrap();
@@ -270,7 +383,7 @@ fn run_command(app_handle: tauri::AppHandle, args: Vec<String>, is_server: Optio
         command_output_str = "server-command-output";
     }
     thread::spawn(move || {
-        let core_path = get_tool_exe_path(String::from("\\easytier\\easytier-core.exe"));
+        let core_path = get_tool_exe_path("\\easytier\\easytier-core.exe");
         // trace, debug, info, warn, error, off
         let mut child = Command::new(&core_path)
             .args(args)
@@ -356,20 +469,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();
-        }
     }
 }
 
@@ -573,7 +683,7 @@ pub fn run() {
         .setup(move |app| {
             // 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(
@@ -621,12 +731,16 @@ pub fn run() {
             stop_command,
             get_core_version,
             fetch_easytier_list,
+            fetch_game_releases,
             download_easytier_zip,
             get_members_by_cli,
+            get_route_by_cli,
             search_pid_by_pname,
             get_exe_directory,
             spawn_autostart,
-            autostart_is_enabled
+            autostart_is_enabled,
+            prevent_sleep,
+            allow_sleep
         ])
         .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.9",
+	"version": "1.3.3",
 	"identifier": "com.tauri.easytier-game",
 
 	"build": {
@@ -13,7 +13,7 @@
 	"app": {
 		"windows": [
 			{
-				"title": "easytier-game 1.2.9",
+				"title": "easytier-game 1.3.3",
 				"label": "main",
 				"minWidth": 340,
 				"width": 340,

stores/index.ts

@@ -1,5 +1,5 @@
-import { defineStore } from "pinia";
+import { acceptHMRUpdate, defineStore } from "pinia";
-export default defineStore("main", {
+const store = defineStore("main", {
 	state() {
 		return {
 			config: {
@@ -15,6 +15,8 @@ export default defineStore("main", {
 				disableIpv6: false, // 是否禁用IPv6
 				port: "11010", // 监听端口号
 				enableCustomListener: false, // 是否自定义监听
+				customListenerV6Data: "", //自定义ipv6监听
+				enableCustomListenerV6: false, // 是否自定义监听
 				customListenerData: "", // 自定义监听地址
 				disbleListenner: false, // 是否禁用监听
 				disableEncryption: true, // 是否禁用加密
@@ -31,10 +33,12 @@ export default defineStore("main", {
 				logLevel: "error", //日志等级
 				devName: false, //自定义网卡名
 				devNameValue: "", //自定义网卡名
-				enableCustonProtocol: false, //自定义默认协议
+				enableCustomProtocol: false, //自定义默认协议
 				customProtocol: "tcp", //自定义默认协议
 				enableNetCardMetric: false, //启用网卡自定义跃点
-				netCardMetricValue: 1 //自定义网卡跃点值
+				netCardMetricValue: 1, //自定义网卡跃点值
+				enablePreventSleep: false, //组织系统休眠
+				compression: "none", //加密算法
 			},
 			serverConfig: {
 				enableWhiteList: true, // 是否启用白名单
@@ -70,7 +74,6 @@ export default defineStore("main", {
 			"config.autoStart",
 			"config.connectAfterStart",
 			"config.disableIpv6",
-			"config.disbleListenner",
 			"config.disableEncryption",
 			"config.multiThread",
 			"config.enablExitNode",
@@ -88,10 +91,17 @@ export default defineStore("main", {
 			"config.enableNetCardMetric",
 			"config.netCardMetricValue",
 			"config.port",
+			
+			"config.disbleListenner",
 			"config.enableCustomListener",
 			"config.customListenerData",
-			"config.enableCustonProtocol",
+			"config.enableCustomListenerV6",
+			"config.customListenerV6Data",
+
+			"config.enableCustomProtocol",
 			"config.customProtocol",
+			"config.enablePreventSleep",
+			"config.compression",
 
 			"serverConfig.autoStart",
 			// 'serverConfig.enableListener',
@@ -113,3 +123,5 @@ export default defineStore("main", {
 		// omit: ["winipBcPid", "winipBcStart"]
 	}
 });
+if (import.meta.hot) import.meta.hot.accept(acceptHMRUpdate(store, import.meta.hot));
+export default store;

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;
 
@@ -70,7 +71,22 @@ export const supportProtocols = () => {
 	return _supportProtocols.slice();
 }
 
-export const parsePeerInfo = (content: string) => {
+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 parseCliInfo = (content: string) => {
 	if(!content) return [];
 	// 将表格字符串分割成行
 	const lines = content.split("\n");

utils/service.ts

@@ -1,5 +1,4 @@
 import useMainStore from "@/stores/index";
-import * as tauriAutoStart from "@tauri-apps/plugin-autostart";
 import { open, Command } from "@tauri-apps/plugin-shell";
 import { invoke } from "@tauri-apps/api/core";
 
@@ -52,19 +51,3 @@ const handleAutoStartByNssm = async () => {
 		}
 	}
 };
-
-// 兼容autostart插件
-const compatibleAutoStart = async () => {
-    const config = useMainStore().config;
-	const is_enable = await tauriAutoStart.isEnabled();
-	if (is_enable) {
-		try {
-			await tauriAutoStart.disable();
-			config.autoStart = false;
-		} catch (err) {
-			// ElMessage.error(`取消自启失败`);
-		}
-	}
-	const serverStatus = await Command.create("nssm", ["status", import.meta.env.VITE_AUTO_START_SERVICE_NAME]).execute();
-	console.log(serverStatus);
-};