增加窗口保存需要的权限，修改启动自动联机错误的英文拼写

保存窗口的大小状态，优化成员列表显示，开机自启隐藏于托盘，服务器地址输入支持带协议 [protocol]://
开机自启功能修复完成
2025-05-19 10:27:56 +00:00 · 2024-11-15 17:25:14 +08:00 · 2024-11-15 16:22:21 +08:00 · 2024-11-15 00:13:49 +08:00 · 2024-11-14 14:57:42 +08:00 · 2024-11-13 16:50:53 +08:00
28 changed files with 3190 additions and 4233 deletions
@@ -10,7 +10,5 @@ dist
 .idea
 .vscode
 release
-src-tauri/easytier-cli.exe
-src-tauri/easytier-core.exe
-src-tauri/Packet.dll
-src-tauri/wintun.dll
+
+src-tauri/easytier/logs
@@ -41,6 +41,11 @@ Releases： [https://github.com/EasyTier/EasytierGame/releases](https://github.c

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

+- 1.1.8 新增了 生成 easytier/config.json 的功能 会将一部分配置写入到 config.json 文件中，方便用户自定义配置，你可以在高级设置里启用和关闭这个功能(默认关闭)
+**需要注意的是，如果config.json存在，每次启动easytierGame默认按照config.json的配置为准**
+**解压zip后你可以查看 easytier/config_template.json 里的注释进行配置**
+![game-step10](/assets/game-step10.png)
+
 ## 特性

 - 基于easytier组网工具开发，界面清晰简单
@@ -0,0 +1,45 @@
+import { BaseDirectory, writeTextFile } from "@tauri-apps/plugin-fs";
+import useMainStore from "@/stores/index";
+import { ElMessage } from "element-plus";
+import { uniq, intersection, isNil } from "lodash-es";
+export const updateConfigJson = async (configJsonSeverUrl: Array<string> | string | null | undefined) => {
+	const mainStore = useMainStore();
+	const path = import.meta.env.VITE_CONFIG_FILE_NAME;
+	if (isNil(configJsonSeverUrl)) {
+		configJsonSeverUrl = [];
+	}
+	const isArray = Array.isArray(configJsonSeverUrl);
+	const isString = typeof configJsonSeverUrl === "string";
+	try {
+		const {
+			proxyNetworks,
+			autoStart,
+			relayAllPeerrpc,
+			connectAfterStart,
+			multiThread,
+			enablExitNode,
+			useSmoltcp,
+			saveErrorLog,
+			logLevel,
+			serverUrl,
+			...otherConfig
+		} = mainStore.config;
+		let writeServerUrl: Array<string> | string = serverUrl;
+		if (isArray) {
+			writeServerUrl = intersection(
+				uniq([serverUrl, ...configJsonSeverUrl]).filter(boolean => boolean),
+				mainStore.basePeers
+			);
+		}
+		if (isString && configJsonSeverUrl) {
+			writeServerUrl = intersection(
+				uniq([serverUrl, ...(configJsonSeverUrl as string).split(",")]).filter(boolean => boolean),
+				mainStore.basePeers
+			).join(",");
+		}
+		await writeTextFile(path, JSON.stringify({ serverUrl: writeServerUrl, ...otherConfig }, null, 4), { baseDir: BaseDirectory.Resource });
+	} catch (err) {
+		console.log(err);
+		ElMessage.error(`更新config.json失败`);
+	}
+};
@@ -1,8 +0,0 @@
-// const infoDialog = new WebviewWindow("log", {
-//     title: "日志",
-//     resizable: false,
-//     width: 600,
-//     height: 400,
-//     parent: appWindow,
-//     url: "/log"
-// });
@@ -4,6 +4,7 @@ import { getCurrentWindow } from "@tauri-apps/api/window";
 import pkg from "@/package.json";
 import { setTheme } from "~/composables/theme";
 import useMainStore from "@/stores/index";
+import { resourceDir as getResourceDir, join } from "@tauri-apps/api/path";

 const DEFAULT_TRAY_NAME = "main";

@@ -113,7 +114,10 @@ export async function MenuItemTheme() {

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

 export async function setTrayTooltip(tray: TrayIcon | null, tooltip?: string | null) {
@@ -1,38 +1,42 @@
 import { type UnlistenFn } from "@tauri-apps/api/event";
-import { getCurrentWindow, PhysicalPosition, type WindowOptions, Window } from "@tauri-apps/api/window";
+import { getCurrentWindow, PhysicalPosition, type WindowOptions, Window, currentMonitor } from "@tauri-apps/api/window";
 import { WebviewWindow } from "@tauri-apps/api/webviewWindow";
-import type { WebviewLabel, WebviewOptions, } from "@tauri-apps/api/webview";
+import type { WebviewLabel, WebviewOptions } from "@tauri-apps/api/webview";
 export default async (
 	label: WebviewLabel,
 	options?: Omit<WebviewOptions, "x" | "y" | "width" | "height"> & WindowOptions,
 	afterCreatedFunc?: (webviewWindow: WebviewWindow, appWindow: Window) => void | null,
 	beforeCloseFunc?: () => void | null
 ) => {
-    let defaultOpts = {
-		parent: undefined,
-		closable: true,
-		resizable: true,
-		decorations: true,
-		maximizable: false,
-		minimizable: false,
-        x: 0,
-        y: 0
-	};
-	const appWindow = getCurrentWindow();
-	if (appWindow) {
-		const appSize = await appWindow.outerSize();
-		const factor = await appWindow.scaleFactor();
-		const appPosition = await appWindow.outerPosition();
-		const logicalPosition = new PhysicalPosition(appPosition.x + appSize.width, appPosition.y).toLogical(factor);
-        defaultOpts.parent = appWindow as any;
-        defaultOpts.x = logicalPosition.x;
-        defaultOpts.y = logicalPosition.y;
-	}
 	let unListenlogClose: UnlistenFn | null = null;
 	let unlistenLogCreated: UnlistenFn | null = null;
 	let dialog = await WebviewWindow.getByLabel(label);
 	if (!dialog) {
-		dialog = new WebviewWindow(label, {...defaultOpts, ...options});
+		let defaultOpts: {[key:string]: any, parent: Window | undefined} = {
+			parent: undefined,
+			closable: true,
+			resizable: true,
+			decorations: true,
+			maximizable: false,
+			minimizable: false,
+			x: 0,
+			y: 0
+		};
+		const appWindow = getCurrentWindow();
+		if (appWindow) {
+			const appSize = await appWindow.outerSize();
+			// const monitor = await currentMonitor();
+			// console.log(monitor)
+			const factor = await appWindow.scaleFactor();
+			const appPosition = await appWindow.outerPosition();
+			// console.log((appPosition.x + appSize.width) / 1.25);
+			const logicalPosition = new PhysicalPosition(appPosition.x + appSize.width, appPosition.y).toLogical(factor);
+			defaultOpts.parent = appWindow;
+			// console.log(logicalPosition);
+			defaultOpts.x = logicalPosition.x;
+			defaultOpts.y = logicalPosition.y;
+		}
+		dialog = new WebviewWindow(label, { ...defaultOpts, ...options });
 		unlistenLogCreated = await dialog.once("tauri://webview-created", async () => {
 			if (dialog) {
 				afterCreatedFunc && (await afterCreatedFunc(dialog, appWindow));
@@ -1,3 +1,4 @@
 VITE_CONFIG_PATH=easytier/config/
+VITE_CONFIG_FILE_NAME=easytier/config.json
 VITE_LOG_PATH=easytier/logs/
 VITE_AUTO_START_SERVICE_NAME=easytierGameAutoStart
@@ -1,3 +1,4 @@
 VITE_CONFIG_PATH=easytier/config/
+VITE_CONFIG_FILE_NAME=easytier/config.json
 VITE_LOG_PATH=easytier/logs/
 VITE_AUTO_START_SERVICE_NAME=easytierGameAutoStart
@@ -1,16 +1,7 @@
 import { defineNuxtConfig } from "nuxt/config";
-import fs from "fs";
 import path from "path";
 import vueJSX from "@vitejs/plugin-vue-jsx";
-const isDev = process?.argv?.[2] == "_dev" || process?.argv?.[2] == "dev";
-const optimizeDepsElementPlusIncludes = ["element-plus/es"];
-fs.readdirSync("node_modules/element-plus/es/components").map(dirname => {
-	fs.access(`node_modules/element-plus/es/components/${dirname}/style/css.mjs`, err => {
-		if (!err) {
-			optimizeDepsElementPlusIncludes.push(`element-plus/es/components/${dirname}/style/css`);
-		}
-	});
-});
+
 export default defineNuxtConfig({
 	ssr: false,

@@ -22,8 +13,19 @@ export default defineNuxtConfig({
 		autoImport: false
 	},

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

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

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

 	app: {
 		rootId: "__easytier",
-		cdnURL: "./", 
+		cdnURL: "./",
 		buildAssetsDir: "__easytier/",
 		head: {
 			meta: [
@@ -102,5 +102,6 @@ export default defineNuxtConfig({
 			// script: [],
 			// noscript: []
 		}
-	}
+	},
+	compatibilityDate: "2024-11-12"
 });
@@ -3,44 +3,36 @@
 	"private": true,
 	"author": "leizi97",
 	"description": "A simple network initiator based on Easytier",
-	"version": "1.1.7",
+	"version": "1.2.1",
 	"scripts": {
 		"dev": "nuxt dev --dotenv env/.env.dev --host 0.0.0.0",
 		"build": "nuxt generate --dotenv env/.env.prod"
 	},
 	"devDependencies": {
 		"@element-plus/icons-vue": "^2.3.1",
-		"@element-plus/nuxt": "^1.0.9",
+		"@element-plus/nuxt": "^1.1.0",
 		"@nuxtjs/tailwindcss": "^6.12.0",
-		"@pinia-plugin-persistedstate/nuxt": "^1.2.0",
-		"@pinia/nuxt": "^0.5.1",
-		"@tauri-apps/api": "^2.0.2",
-		"@tauri-apps/cli": "^2.0.2",
+		"@pinia/nuxt": "^0.7.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-http": "^2.0.0",
+		"@tauri-apps/plugin-clipboard-manager": "^2.0.0",
+		"@tauri-apps/plugin-fs": "~2",
+		"@tauri-apps/plugin-http": "^2.0.1",
 		"@tauri-apps/plugin-shell": "~2",
-		"@tinymce/tinymce-vue": "^5.1.1",
+		"@tauri-apps/plugin-window-state": "~2",
 		"@types/lodash-es": "^4.17.12",
-		"@types/qs": "^6.9.15",
-		"@vitejs/plugin-vue-jsx": "^3.1.0",
+		"@vitejs/plugin-vue-jsx": "^4.1.0",
 		"@vueuse/core": "^11.2.0",
-		"dayjs": "^1.11.10",
-		"defu": "^6.1.4",
-		"element-plus": "^2.8.6",
+		"element-plus": "^2.8.7",
 		"less": "^4.2.0",
 		"lodash-es": "^4.17.21",
-		"nuxt": "^3.11.2",
-		"pinia": "^2.1.7",
+		"nuxt": "^3.13.2",
+		"pinia": "^2.2.6",
+		"pinia-plugin-persistedstate": "^4.1.3",
 		"postcss": "^8.4.38",
-		"qs": "^6.12.0",
-		"typescript": "^5.4.5",
-		"vue": "^3.4.24",
-		"vue-clipboard3": "^2.0.0",
-		"xlsx": "^0.18.5"
-	},
-	"dependencies": {
-		"@tauri-apps/plugin-autostart": "~2",
-		"@tauri-apps/plugin-clipboard-manager": "^2.0.0",
-		"@tauri-apps/plugin-fs": "~2"
+		"typescript": "^5.6.3",
+		"vue-clipboard3": "^2.0.0"
 	}
 }
@@ -1,38 +1,85 @@
 <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 class="flex items-center gap-[10px]">
-			<ElCheckbox v-model="mainStore.config.devName">自定义网卡名</ElCheckbox>
-			<ElInput maxlength="10" v-model="mainStore.config.devNameValue" placeholder="请输入网卡名"/>
-		</div>
 		<div><ElCheckbox v-model="mainStore.config.disbleListenner">不监听任何端口，只连接到对等节点</ElCheckbox></div>
-		<div><ElCheckbox v-model="mainStore.config.coonectAfterStart">软件启动后，自动"启动联机"(搭配开机自启，无感联机)</ElCheckbox></div>
 		<div class="flex items-center gap-[15px] flex-nowrap">
 			<ElCheckbox v-model="mainStore.config.saveErrorLog">输出日志到本地</ElCheckbox>
 			<div class="w-[140px]">
 				<ElSelect
+					size="small"
 					v-model="mainStore.config.logLevel"
 					placeholder="请选择日志等级"
-					class="ml-[5px]">
+					class="ml-[5px]"
+				>
 					<ElOption
 						v-for="item in data"
 						:key="item"
 						:label="`level - ${item}`"
-						:value="item"></ElOption>
+						:value="item"
+					></ElOption>
 				</ElSelect>
 			</div>
 			<ElButton
 				@click="openLogDir"
-				size="small">
+				size="small"
+			>
 				打开日志目录
 			</ElButton>
 		</div>
+		<div><ElCheckbox v-model="mainStore.config.connectAfterStart">软件启动后，自动"启动联机"(搭配开机自启，无感联机)</ElCheckbox></div>
+		<div class="flex items-center gap-[15px] flex-nowrap">
+			<ElCheckbox v-model="mainStore.createConfigInEasytier">自动生成界面配置文件easytier/config.json</ElCheckbox>
+			<ElButton
+				@click="openConfigJsonDir"
+				size="small"
+			>
+				打开config.json目录
+			</ElButton>
+		</div>
+
+		<ElDivider />
+		<div class="flex items-center gap-[10px]">
+			<ElCheckbox v-model="mainStore.config.devName">自定义网卡名</ElCheckbox>
+			<ElInput
+				size="small"
+				maxlength="10"
+				v-model="mainStore.config.devNameValue"
+				placeholder="请输入网卡名"
+			/>
+		</div>
+		<div class="flex items-center gap-[10px]">
+			<ElCheckbox v-model="mainStore.config.enableNetCardMetric">自定义easytier网卡跃点</ElCheckbox>
+			<ElInputNumber
+				controls-position="right"
+				:min="1"
+				:value-on-clear="1"
+				:max="9999"
+				:step="1"
+				:precision="0"
+				size="small"
+				v-model="mainStore.config.netCardMetricValue"
+				placeholder="请选择跃点数"
+			/>
+			<ElTooltip content="设置easytier网卡的跃点，提升网卡优先级，跃点越小，网卡优先级越高">
+				<ElIcon><QuestionFilled /></ElIcon>
+			</ElTooltip>
+		</div>
+		<div>
+			<ElText
+				size="small"
+				type="warning"
+			>
+				(不使用自定义网卡名,那么联机时默认会生成一个名为 "et_xxx" 的网卡，也可以使用 “设置跃点” 功能，除非你启用了下面的功能)
+			</ElText>
+		</div>
+		<div><ElCheckbox v-model="mainStore.config.noTun">不创建TUN设备(网卡)，可以使用子网代理访问节点</ElCheckbox></div>
+
 		<ElDivider />
 		<div><ElCheckbox v-model="mainStore.config.enablExitNode">允许此节点成为出口节点</ElCheckbox></div>
 		<div><ElCheckbox v-model="mainStore.config.disableEncryption">禁用对等节点通信的加密，默认为false，必须与对等节点相同</ElCheckbox></div>
 		<div><ElCheckbox v-model="mainStore.config.multiThread">使用多线程运行时，默认为单线程</ElCheckbox></div>
 		<ElDivider />
-		<div><ElCheckbox v-model="mainStore.config.noTun">不创建TUN设备，可以使用子网代理访问节点</ElCheckbox></div>
+
 		<div><ElCheckbox v-model="mainStore.config.useSmoltcp">为子网代理启用smoltcp堆栈</ElCheckbox></div>
 		<div><ElCheckbox v-model="mainStore.config.latencyfirst">延迟优先模式，将尝试使用最低延迟路径转发流量，默认使用最短路径</ElCheckbox></div>
 		<div><ElCheckbox v-model="mainStore.config.disableUdpHolePunching">禁用UDP打洞功能</ElCheckbox></div>
@@ -43,10 +90,12 @@
 </template>
 <script setup lang="ts">
 	import useMainStore from "@/stores/index";
+	import { QuestionFilled } from "@element-plus/icons-vue";
 	import { getCurrentWindow } from "@tauri-apps/api/window";
 	import { resourceDir as getResourceDir, join } from "@tauri-apps/api/path";
 	import { Command } from "@tauri-apps/plugin-shell";
 	import { exists, mkdir, BaseDirectory } from "@tauri-apps/plugin-fs";
+	import { ElMessage } from "element-plus";

 	const mainStore = useMainStore();
 	const appWindow = getCurrentWindow();
@@ -63,8 +112,21 @@
 		}
 		await Command.create("explorer", [logDirPath]).execute();
 	};
-	mainStore.$subscribe((...a) => {
+	const openConfigJsonDir = async () => {
+		const resourceDir = await getResourceDir();
+		const easytierDir = await join(resourceDir, "easytier/");
+		const isExists = await exists("easytier/", { baseDir: BaseDirectory.Resource });
+		if (isExists) {
+			await Command.create("explorer", [easytierDir]).execute();
+		} else {
+			ElMessage.error("config.json的目录不存在");
+		}
+	};
+	mainStore.$subscribe(async (...a) => {
 		// console.log("subscribe", a);
-		appWindow.emitTo("main", "config", { config: { ...mainStore.config } });
+		await appWindow.emitTo("main", "config", { config: { ...mainStore.config }, createConfigInEasytier: mainStore.createConfigInEasytier });
+		// if(mainStore.createConfigInEasytier) {
+		// 	updateConfigJson();
+		// }
 	});
 </script>
@@ -9,87 +9,91 @@
 			:element-loading-spinner="'<path />'"
 			element-loading-text="-------已经启用配置文件，界面配置不再生效-------" -->
 		<!-- <div> -->
-			<ElFormItem
-				label="服务器"
-				prop="serverUrl"
-			>
-				<template #label>
-					<div class="flex items-center gap-[0_5px]">
-						<div>服务器</div>
-						<span>-</span>
-						<ElTag
-							effect="dark"
-							:type="data.isSuccessGetIp ? 'success' : 'info'"
-						>
-							{{ data.isSuccessGetIp ? "联机成功" : data.isStart && !data.isSuccessGetIp ? "联机中" : "未联机" }}
-						</ElTag>
-						<ElButton
-							v-if="!data.coreVersion"
-							@click="getCoreVersion(true)"
-						>
-							获取内核版本
-						</ElButton>
-						<ElTag
-							v-else
-							type="info"
-						>
-							{{ data.coreVersion }}
-						</ElTag>
-						<ElPopconfirm
-							width="325"
-							cancel-button-text="取消"
-							confirm-button-text="继续"
-							title="内核从github下载，需要出国工具，可能下载缓慢或失败，是否继续?
+		<ElFormItem
+			label="服务器"
+			prop="serverUrl"
+		>
+			<template #label>
+				<div class="flex items-center gap-[0_5px]">
+					<div>服务器</div>
+					<span>-</span>
+					<ElTag
+						effect="dark"
+						:type="data.isSuccessGetIp ? 'success' : 'info'"
+					>
+						{{ data.isSuccessGetIp ? "联机成功" : data.isStart && !data.isSuccessGetIp ? "联机中" : "未联机" }}
+					</ElTag>
+					<ElButton
+						v-if="!data.coreVersion"
+						@click="getCoreVersion(true)"
+					>
+						获取内核版本
+					</ElButton>
+					<ElTag
+						v-else
+						type="info"
+					>
+						{{ data.coreVersion }}
+					</ElTag>
+					<ElPopconfirm
+						width="325"
+						cancel-button-text="取消"
+						confirm-button-text="继续"
+						title="内核从github下载，需要出国工具，可能下载缓慢或失败，是否继续?
 						也可以从官方群里手动下载后解压到easytier-game.exe同级目录下的easytier目录里,全部覆盖即可"
-							@confirm="handleUpdateCore"
+						@confirm="handleUpdateCore"
+					>
+						<template #reference>
+							<ElButton
+								:disabled="data.isStart"
+								:loading="data.update"
+								type="warning"
+								size="small"
+							>
+								{{ data.coreVersion ? "更新内核" : "下载内核" }}
+							</ElButton>
+						</template>
+					</ElPopconfirm>
+				</div>
+			</template>
+			<ElSelect
+				allow-create
+				filterable
+				placeholder="请选择服务器地址"
+				default-first-option
+				v-model="config.serverUrl"
+				@change="handleServerUrlChange"
+			>
+				<template #prefix>
+					<div :class="config.protocol && config.protocol.length > 1 ? 'w-[120px]' : 'w-[80px]'">
+						<ElSelect
+							placeholder="协议"
+							multiple
+							collapse-tags
+							@click.stop
+							v-model="config.protocol"
+							@change="handleServerUrlChange"
 						>
-							<template #reference>
-								<ElButton
-									:disabled="data.isStart"
-									:loading="data.update"
-									type="warning"
-									size="small"
-								>
-									{{ data.coreVersion ? "更新内核" : "下载内核" }}
-								</ElButton>
-							</template>
-						</ElPopconfirm>
+							<ElOption
+								v-for="item in protocols"
+								:key="item"
+								:label="item"
+								:value="item"
+							></ElOption>
+						</ElSelect>
 					</div>
 				</template>
-				<ElSelect
-					allow-create
-					filterable
-					default-first-option
-					v-model="config.serverUrl"
-					@change="handleServerUrlChange"
+				<ElOption
+					v-for="item in mainStore.basePeers"
+					:key="item"
+					:label="item"
+					:value="item"
 				>
-					<template #prefix>
-						<div :class="config.protocol && config.protocol.length > 1 ? 'w-[120px]' : 'w-[80px]'">
-							<ElSelect
-								placeholder="协议"
-								multiple
-								collapse-tags
-								@click.stop
-								v-model="config.protocol"
-								@change="handleServerUrlChange"
-							>
-								<ElOption
-									v-for="item in protocols"
-									:key="item"
-									:label="item"
-									:value="item"
-								></ElOption>
-							</ElSelect>
-						</div>
-					</template>
-					<ElOption
-						v-for="item in mainStore.basePeers"
-						:key="item"
-						:label="item"
-						:value="item"
-					>
-						<div class="flex items-center justify-between">
-							<span style="float: left">{{ item }}</span>
+					<div class="flex items-center gap-[20px] overflow-hidden flex-nowrap max-w-[calc(100vw-62px)]">
+						<ElTooltip :content="item">
+							<p class="truncate">{{ item }}</p>
+						</ElTooltip>
+						<div class="flex-shrink-0 ml-auto">
 							<ElButton
 								@click.stop="handleDeleteServerUrl(item)"
 								round
@@ -97,91 +101,92 @@
 								type="danger"
 							></ElButton>
 						</div>
-					</ElOption>
-				</ElSelect>
-			</ElFormItem>
-			<div class="flex flex-wrap gap-[0_10px] items-center">
-				<div class="flex-1">
-					<ElFormItem label="网络名">
-						<template #label>
-							<div class="flex items-center">
-								网络名
-								<ElTooltip content="对应命令行参数 --network-name">
-									<ElIcon><QuestionFilled /></ElIcon>
-								</ElTooltip>
-							</div>
-						</template>
-						<ElInput
-							maxlength="100"
-							placeholder="请输入网络名"
-							v-model="config.networkName"
-						></ElInput>
-					</ElFormItem>
-				</div>
-				<div class="flex-1">
-					<ElFormItem label="网络密码">
-						<template #label>
-							<div class="flex items-center">
-								网络密码
-								<ElTooltip content="对应命令行参数 --network-secret">
-									<ElIcon><QuestionFilled /></ElIcon>
-								</ElTooltip>
-							</div>
-						</template>
-						<ElInput
-							show-password
-							maxlength="100"
-							placeholder="请输入网络密码"
-							v-model="config.networkPassword"
-							type="password"
-						></ElInput>
-					</ElFormItem>
-				</div>
-			</div>
-			<div class="flex gap-[0_10px]">
-				<ElFormItem label="主机名">
+					</div>
+				</ElOption>
+			</ElSelect>
+		</ElFormItem>
+		<div class="flex flex-wrap gap-[0_10px] items-center">
+			<div class="flex-1">
+				<ElFormItem label="网络名">
 					<template #label>
 						<div class="flex items-center">
-							主机名
-							<ElTooltip content="对应命令行参数 --hostname">
+							网络名
+							<ElTooltip content="对应命令行参数 --network-name">
 								<ElIcon><QuestionFilled /></ElIcon>
 							</ElTooltip>
 						</div>
 					</template>
 					<ElInput
 						maxlength="100"
-						placeholder="例如: Player1"
-						v-model="config.hostname"
-					></ElInput>
-				</ElFormItem>
-				<ElFormItem
-					class="w-[70%]"
-					label="局域网IP"
-				>
-					<template #label>
-						<div class="flex items-center h-[20px]">
-							虚拟网IP
-							<ElTooltip content="对应命令行参数 --ipv4">
-								<ElIcon><QuestionFilled /></ElIcon>
-							</ElTooltip>
-							<ElSwitch
-								v-model="config.dhcp"
-								class="ml-[5px]"
-								inline-prompt
-								inactive-text="固定IP"
-								active-text="动态获取IP"
-								size="small"
-							></ElSwitch>
-						</div>
-					</template>
-					<ElInput
-						maxlength="100"
-						:disabled="config.dhcp"
-						:placeholder="data.isStart && config.dhcp ? '等待动态分配IP...' : '例如: 10.126.126.1'"
-						v-model="config.ipv4"
+						placeholder="请输入网络名"
+						v-model="config.networkName"
 					></ElInput>
 				</ElFormItem>
 			</div>
+			<div class="flex-1">
+				<ElFormItem label="网络密码">
+					<template #label>
+						<div class="flex items-center">
+							网络密码
+							<ElTooltip content="对应命令行参数 --network-secret">
+								<ElIcon><QuestionFilled /></ElIcon>
+							</ElTooltip>
+						</div>
+					</template>
+					<ElInput
+						show-password
+						maxlength="100"
+						placeholder="请输入网络密码"
+						v-model="config.networkPassword"
+						type="password"
+					></ElInput>
+				</ElFormItem>
+			</div>
+		</div>
+		<div class="flex gap-[0_10px]">
+			<ElFormItem label="主机名">
+				<template #label>
+					<div class="flex items-center">
+						主机名
+						<ElTooltip content="对应命令行参数 --hostname">
+							<ElIcon><QuestionFilled /></ElIcon>
+						</ElTooltip>
+					</div>
+				</template>
+				<ElInput
+					maxlength="100"
+					placeholder="例如: Player1"
+					v-model="config.hostname"
+				></ElInput>
+			</ElFormItem>
+			<ElFormItem
+				class="w-[70%]"
+				label="局域网IP"
+			>
+				<template #label>
+					<div class="flex items-center h-[20px]">
+						虚拟网IP
+						<ElTooltip content="对应命令行参数 --ipv4">
+							<ElIcon><QuestionFilled /></ElIcon>
+						</ElTooltip>
+						<ElSwitch
+							v-model="config.dhcp"
+							class="ml-[5px]"
+							inline-prompt
+							inactive-text="固定IP"
+							active-text="动态获取IP"
+							size="small"
+						></ElSwitch>
+					</div>
+				</template>
+				<ElInput
+					maxlength="100"
+					:disabled="config.dhcp"
+					:placeholder="data.isStart && config.dhcp ? '等待动态分配IP...' : '例如: 10.126.126.1'"
+					v-model="config.ipv4"
+				></ElInput>
+			</ElFormItem>
+		</div>
 		<!-- </div> -->
 		<div class="flex items-start">
 			<div>
@@ -189,6 +194,7 @@
 					<ElDropdown
 						@command="handleStartCommand"
 						split-button
+						trigger="click"
 						size="default"
 						:type="!data.isStart ? 'primary' : 'danger'"
 						:disabled="data.startLoading || !data.coreVersion || data.update"
@@ -254,13 +260,15 @@
 				>
 					强制中转
 				</ElCheckbox>
-				<ElCheckbox
-					@change="handleAutoStart"
-					:model-value="config.autoStart"
-					size="small"
-				>
-					开机自启
-				</ElCheckbox>
+				<ElTooltip placement="top-start" content="自启后隐藏于托盘，不显示界面">
+					<ElCheckbox
+						@change="handleAutoStartByTask"
+						:model-value="config.autoStart"
+						size="small"
+					>
+						开机自启
+					</ElCheckbox>
+				</ElTooltip>
 				<div>
 					<ElButton
 						@click="handleShowCidrDialog"
@@ -302,6 +310,8 @@
 	<ElDialog
 		width="95%"
 		top="10px"
+		append-to-body
+		:z-index="10"
 		class="!mb-0"
 		v-model="importConfigData.visible"
 		:close-on-press-escape="false"
@@ -315,7 +325,7 @@
 		></ElInput>
 		<template #footer>
 			<div>
-				<el-text type="danger">导入成功后，您当前的配置将被完全替换</el-text>
+				<el-text type="danger">导入成功后，您当前的部分配置将被替换</el-text>
 			</div>
 			<div class="text-right">
 				<ElButton
@@ -331,6 +341,8 @@
 	<ElDialog
 		width="95%"
 		top="30px"
+		append-to-body
+		:z-index="10"
 		class="!mb-0"
 		v-model="configStart.visible"
 		:close-on-press-escape="false"
@@ -393,14 +405,17 @@
 	import { useTray, setTrayRunState, setTrayTooltip } from "~/composables/tray";
 	import { initStartWinIpBroadcast } from "~/composables/netcard";
 	import useMainStore from "@/stores/index";
-	import { ElDropdownMenu, ElMessage, ElMessageBox } from "element-plus";
+	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 } from "@tauri-apps/plugin-fs";
+	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 } from "~/utils";

 	let is_close = false;

@@ -413,7 +428,7 @@
 	const mainStore = useMainStore();
 	const config = mainStore.config;
 	// console.log(config);
-	const protocols = ["tcp", "udp", "ws", "wss", "wg"];
+	const protocols = ["tcp", "udp", "ws", "wss", "wg", "quic"];
 	const data = reactive({
 		logVisible: false,
 		cidrVisible: false,
@@ -429,7 +444,8 @@
 		isSuccessGetIp: false,
 		startLoading: false,
 		isStart: false,
-		connectionSuccess: false
+		connectionSuccess: false,
+		configJsonSeverUrl: "" // 本地保存一次，用于回填config.json
 	});

 	const configStart = reactive<{ list: Array<{ path: string; name: string }>; [key: string]: any }>({
@@ -467,11 +483,25 @@
 			}
 			newBasePeers.splice(idx, 1);
 		}
-		mainStore.basePeers = [...new Set([...newBasePeers])];
+		mainStore.basePeers = uniq([...newBasePeers]);
+		if (mainStore.basePeers.length > 0) {
+			mainStore.config.serverUrl = mainStore.basePeers[0];
+		}
 	};

 	const handleServerUrlChange = () => {
-		mainStore.basePeers = [...new Set([config.serverUrl, ...mainStore.basePeers])];
+		let inputProtocols: string | null = null;
+		for (const p of protocols) {
+			if (config.serverUrl.toLowerCase().startsWith(`${p}://`)) {
+				inputProtocols = p;
+				break;
+			}
+		}
+		if (inputProtocols) {
+			mainStore.config.protocol = [inputProtocols];
+			mainStore.config.serverUrl = mainStore.config.serverUrl.slice(inputProtocols.length + 3);
+		}
+		mainStore.basePeers = uniq([mainStore.config.serverUrl, ...mainStore.basePeers]);
 	};

 	const listenObj: { [key: string]: any } = {
@@ -483,9 +513,11 @@
 			// const appWindow = getCurrentWindow();
 			const unListen = await listen("command-output", async event => {
 				data.isStart = true;
+				// console.log(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 (ipv4) {
 							config.ipv4 = ipv4;
@@ -500,12 +532,31 @@
 							await setTrayTooltip(tray, `IP: ${config.ipv4}`);
 						}
 					}
+					if (
+						devName &&
+						mainStore.config.enableNetCardMetric &&
+						mainStore.config.netCardMetricValue &&
+						mainStore.config.netCardMetricValue >= 1 &&
+						mainStore.config.netCardMetricValue <= 9999
+					) {
+						try {
+							const output = await Command.create(
+								"netsh",
+								["interface", "ipv4", "set", "interface", devName, "metric=", `${mainStore.config.netCardMetricValue}`],
+								{
+									encoding: "gb2312"
+								}
+							).execute();
+						} catch (err) {
+							console.log(err);
+							ElMessage.error("跃点设置失败");
+						}
+					}
 				}
 				const logArr = data.log.split("\n");
 				const start = logArr.length > 1000 ? logArr.length - 1000 : 0;
 				data.log = logArr.slice(start).join("\n");
 				data.log += (event.payload as string) + "\n";
-
 			});
 			this.unListenOutPut = unListen;
 		},
@@ -519,7 +570,7 @@
 		},
 		async listenConfigStart() {
 			const unListen = await listen("config", event => {
-				// console.log("config", event.payload);
+				console.log("config", event.payload);
 				const ipv4 = config.ipv4;
 				mainStore.$patch(event.payload as any);
 				config.ipv4 = ipv4;
@@ -583,6 +634,7 @@
 	const getReleaseList = async () => {
 		const list = await invoke("fetch_easytier_list");
 		data.releaseList = list as never[];
+		console.log(data.releaseList);
 	};

 	const handleAutoStart = async () => {
@@ -629,31 +681,89 @@

 	const compatibleInitAutoStart = async () => {
 		try {
-			const is_enable_by_task = (await invoke("autostart_is_enabled")) as boolean;
-			if (is_enable_by_task) {
-				await tauriAutoStart.enable();
-				await invoke("spawn_autostart", { enabled: false });
-			}
 			const is_enable = await tauriAutoStart.isEnabled();
-			config.autoStart = is_enable;
+			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重新加载一次开机自启，因为可能路径变了
+				await invoke("spawn_autostart", { enabled: false });
+				await invoke("spawn_autostart", { enabled: true });
+			}
+			is_enable_by_task = (await invoke("autostart_is_enabled")) as boolean;
+			config.autoStart = is_enable_by_task;
 		} catch (err) {
+			console.log(err);
 			await invoke("spawn_autostart", { enabled: false });
-			await tauriAutoStart.disable();
-			config.autoStart = false;
+			const is_enable_by_task = (await invoke("autostart_is_enabled")) as boolean;
+			config.autoStart = is_enable_by_task;
 		}
 	};

 	const initConnectAfterStart = async () => {
-		if (config.coonectAfterStart && data.coreVersion) {
+		if (config.connectAfterStart && data.coreVersion) {
 			await reset();
 			await handleConnection();
 		}
 	};

+	const initGuiJson = async () => {
+		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 });
+			if (guiJsonStr) {
+				try {
+					const regex = /^(\s*\/\/.*)/gm;
+					const regex2 = /(,?)\s*\/\/.*(?=\n|$|\r\n)/gm;
+					const resultStr = guiJsonStr.replace(regex, "").replace(regex2, "$1");
+					const guiJson = JSON.parse(resultStr);
+					let saveServerUrl = "";
+					if (guiJson.serverUrl) {
+						if (Array.isArray(guiJson.serverUrl)) {
+							mainStore.basePeers = uniq([...guiJson.serverUrl, ...mainStore.basePeers]);
+						}
+						if (typeof guiJson.serverUrl === "string") {
+							mainStore.basePeers = uniq([...guiJson.serverUrl.split(","), ...mainStore.basePeers]);
+						}
+						saveServerUrl = mainStore.basePeers[0] || "";
+					} else {
+						saveServerUrl = mainStore.basePeers.length > 0 ? mainStore.basePeers[0] || "" : "";
+					}
+					data.configJsonSeverUrl = guiJson.serverUrl;
+					mainStore.$patch({
+						config: {
+							...guiJson,
+							...mainStore.config,
+							serverUrl: saveServerUrl
+						}
+					});
+					if (mainStore.createConfigInEasytier) {
+						await updateConfigJson(data.configJsonSeverUrl);
+					}
+				} catch (err) {
+					console.log(err);
+					ElMessage.error(`config.json格式错误`);
+				}
+			}
+		}
+		const b = bounce(600);
+		mainStore.$subscribe((...a) => {
+			if (mainStore.createConfigInEasytier) {
+				b(async () => {
+					await updateConfigJson(data.configJsonSeverUrl);
+				});
+			}
+		});
+	};
+
 	let logsTimer: NodeJS.Timeout | null = null;

 	onMounted(async () => {
 		// await handleUpdateCore();  //默认不自动更新
+		await initGuiJson();
 		await compatibleInitAutoStart();
 		// await initAutoStart();
 		await initStartWinIpBroadcast();
@@ -784,10 +894,10 @@
 			if (!args || args.length <= 0) {
 				return ElMessage.error("无配置");
 			}
-			if(args[0] === "-c") {
+			if (args[0] === "-c") {
 				ElMessage.warning({
 					message: "使用配置文件中.",
-					duration: 5000,
+					duration: 5000
 				});
 			}
 			data.log = ""; //清空日志
@@ -825,7 +935,20 @@
 		}
 		if (command === "share_config") {
 			try {
-				const WT = btoa(encodeURIComponent(JSON.stringify({ config: mainStore.config })))
+				const {
+					proxyNetworks,
+					autoStart,
+					connectAfterStart,
+					multiThread,
+					hostname,
+					enablExitNode,
+					useSmoltcp,
+					saveErrorLog,
+					logLevel,
+					ipv4,
+					...otherConfig
+				} = mainStore.config;
+				const WT = btoa(encodeURIComponent(JSON.stringify({ config: otherConfig })));
 				await writeText(WT);
 				ElMessage.success("配置已复制");
 			} catch (err) {
@@ -846,11 +969,17 @@
 				cancelButtonText: "取消"
 			});
 			const payload = JSON.parse(decodeURIComponent(atob(importConfigData.data)));
-			mainStore.$patch(payload);
+			mainStore.$patch({
+				config: {
+					...mainStore.config,
+					...payload.config
+				}
+			});
 			ElMessage.success("导入成功");
 			importConfigData.visible = false;
-			mainStore.basePeers = [...new Set([config.serverUrl, ...mainStore.basePeers])];
+			mainStore.basePeers = uniq([config.serverUrl, ...mainStore.basePeers]);
 		} catch (err) {
+			console.log(err);
 			if (err !== "cancel") {
 				ElMessage.error("导入失败");
 			}
@@ -865,7 +994,9 @@
 			mainStore.configPath = "";
 			try {
 				await mkdir(path, { baseDir: BaseDirectory.Resource });
-			} catch (err) {}
+			} catch (err) {
+				console.log(err);
+			}
 		}
 	};

@@ -888,7 +1019,7 @@
 			"member",
 			{
 				title: "成员列表",
-				width: 470,
+				width: 875,
 				height: 380,
 				url: "#/member"
 			},
@@ -6,26 +6,66 @@
 				stripe
 				border
 				:data="data.member"
-				v-else>
+				v-else
+			>
 				<ElTableColumn
-					v-for="prop in showTableHeader"
 					sortable
-					:prop="prop[0]"
-					:label="prop[1]"
-					:key="prop[0]">
+					width="140"
+					label="主机名"
+					prop="hostname"
+				></ElTableColumn>
+				<ElTableColumn
+					sortable
+					width="90"
+					prop="cost"
+					label="路由"
+				>
 					<template #default="{ row }">
-						<span v-if="prop[0] == 'loss_rate'">
-							{{ row[prop[0]] && row[prop[0]] != "-" ? Number(row[prop[0]] * 100).toFixed(2) + "%" : row[prop[0]] }}
-						</span>
-						<span v-else-if="prop[0] != 'cost'">{{ row[prop[0]] }}</span>
 						<ElTag
-							v-else
 							effect="dark"
-							:type="row[prop[0]] == 'p2p' ? 'success' : 'info'">
-							{{ row[prop[0]] }}
+							:type="row.cost == 'p2p' ? 'success' : 'info'"
+						>
+							{{ row.cost }}
 						</ElTag>
 					</template>
 				</ElTableColumn>
+				<ElTableColumn
+					sortable
+					width="120"
+					prop="ipv4"
+					label="虚拟网IP"
+				></ElTableColumn>
+				<ElTableColumn
+					sortable
+					prop="lat_ms"
+					width="130"
+					label="延迟/ms"
+				></ElTableColumn>
+				<ElTableColumn
+					sortable
+					width="120"
+					prop="loss_rate"
+					label="丢包率"
+				>
+					<template #default="{ row }">
+						{{ row.loss_rate && row.loss_rate != "-" ? Number(row.loss_rate * 100).toFixed(2) + "%" : row.loss_rate }}
+					</template>
+				</ElTableColumn>
+				<ElTableColumn
+					sortable
+					width="120"
+					label="nat_type"
+					prop="NAT类型"
+				>
+					<template #default="{ row }">
+						{{ natMaps[row.nat_type.toLowerCase() as natKyes] || row.nat_type || "-" }}
+					</template>
+				</ElTableColumn>
+				<ElTableColumn
+					sortable
+					prop="version"
+					label="版本"
+				></ElTableColumn>
 			</ElTable>
 		</div>
 	</div>
@@ -34,24 +74,40 @@
 	import { invoke } from "@tauri-apps/api/core";
 	import { reactive, onMounted, onBeforeUnmount } from "vue";
 	import { parsePeerInfo } from "@/utils";
+
+	const natMaps = {
+		unknown: "未知",
+		nopat: "nat0",
+		fullcone: "nat1",
+		restricted: "nat2",
+		addressrestricted: "nat2",
+		portrestricted: "nat3",
+		symmetric: "nat4"
+	};
+	type natKyes = keyof typeof natMaps;
+	// NAT1: Full Cone NAT，全锥形NAT，这是最宽松的网络环境，你想做什么，基本没啥限制IP和端口都不受限。
+	// NAT2: Address-Restricted Cone NAT，受限锥型NAT，相比NAT1，NAT2 增加了地址限制，也就是IP受限，而端口不受限。
+	// NAT3: Port-Restricted Cone NAT，端口受限锥型，相比NAT2，NAT3 又增加了端口限制，也就是说IP、端口都受限。
+	// NAT4: Symmetric NAT，对称型NAT，对称型NAT具有端口受限锥型的受限特性，内部地址每一次请求一个特定的外部地址，
+	// 都可能会绑定到一个新的端口号。也就是请求不同的外部地址映射的端口号是可能不同的。这种类型基本上就告别 P2P 了。
 	const data = reactive<{ member: any[] }>({
-		member: [],
+		member: []
 	});

-	const showTableHeader = [
+	const _showTableHeader = [
 		["hostname", "主机名"],
-		["lat_ms", "延迟/ms"],
-		["ipv4", "虚拟网IP"],
 		["cost", "路由"],
+		["ipv4", "虚拟网IP"],
+		["lat_ms", "延迟/ms"],
 		["loss_rate", "丢包率"],
 		["nat_type", "NAT类型"],
-		["version", "版本"],
+		["version", "版本"]
 	];

 	const listenOutput = async () => {
-		const member = await invoke("get_members_by_cli");
-		const peerInfo = parsePeerInfo(member as string);
-		peerInfo.forEach((value) => {
+		const member = await invoke<string>("get_members_by_cli");
+		const peerInfo = parsePeerInfo(member);
+		peerInfo.forEach(value => {
 			if (value.cost === "Local") {
 				value.cost = "本机";
 			}
@@ -1,10 +0,0 @@
-import { createPersistedState } from "pinia-plugin-persistedstate";
-import { defineNuxtPlugin } from "nuxt/app";
-export default defineNuxtPlugin((nuxtApp: any) => {
-	nuxtApp.$pinia.use(
-		createPersistedState({
-			storage: localStorage,
-			key: id => `__glj_persisted_${id}`
-		})
-	);
-});
@@ -2,4 +2,5 @@
 # will have compiled files and executables
 /target/
 /gen/schemas
-/easytier/
+/easytier/logs
+/easytier/logs/*.*
@@ -1176,7 +1176,7 @@ checksum = "0d6ef0072f8a535281e4876be788938b528e9a1d43900b82c2569af7da799125"

 [[package]]
 name = "easytier-game"
-version = "1.1.7"
+version = "1.2.1"
 dependencies = [
 "log",
 "planif",
@@ -1192,6 +1192,7 @@ dependencies = [
 "tauri-plugin-log",
 "tauri-plugin-shell",
 "tauri-plugin-single-instance",
+ "tauri-plugin-window-state",
 "whoami",
 "windows 0.58.0",
 "zip",
@@ -4543,6 +4544,21 @@ dependencies = [
 "zbus",
 ]

+[[package]]
+name = "tauri-plugin-window-state"
+version = "2.0.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "683c8764751fbbcebf3a594bcee24cf84c62773fa0080d1b40fc80698472421e"
+dependencies = [
+ "bitflags 2.6.0",
+ "log",
+ "serde",
+ "serde_json",
+ "tauri",
+ "tauri-plugin",
+ "thiserror 1.0.64",
+]
+
 [[package]]
 name = "tauri-runtime"
 version = "2.2.0"
@@ -1,6 +1,6 @@
 [package]
 name = "easytier-game"
-version = "1.1.7"
+version = "1.2.1"
 homepage = "https://github.com/EasyTier/EasyTier"
 repository = "https://github.com/EasyTier/EasytierGame"
 description = "A simple network initiator based on Easytier"
@@ -50,3 +50,4 @@ features = ["Win32_System_TaskScheduler"]
 [target."cfg(not(any(target_os = \"android\", target_os = \"ios\")))".dependencies]
 tauri-plugin-autostart = "2.0.1"
 tauri-plugin-single-instance = "2.0.1"
+tauri-plugin-window-state = "2"
@@ -41,7 +41,7 @@
          "args": [
            "run"
          ],
-          "cmd": "easytier/tool/WinIPBroadcast",
+          "cmd": "$RESOURCE/easytier/tool/WinIPBroadcast",
          "name": "WinIPBroadcast"
        }
      ]
@@ -53,12 +53,12 @@
          "args": [
            "run"
          ],
-          "cmd": "easytier/tool/WinIPBroadcast",
+          "cmd": "$RESOURCE/easytier/tool/WinIPBroadcast",
          "name": "WinIPBroadcast"
        },
        {
          "args": true,
-          "cmd": "easytier/tool/nssm",
+          "cmd": "$RESOURCE/easytier/tool/nssm",
          "name": "nssm"
        },
        {
@@ -84,8 +84,14 @@
    "fs:allow-open",
    "fs:allow-resource-read",
    "fs:allow-resource-read-recursive",
+    "fs:allow-resource-write",
+    "fs:allow-resource-write-recursive",
    "clipboard-manager:allow-clear",
    "clipboard-manager:allow-read-text",
-    "clipboard-manager:allow-write-text"
+    "clipboard-manager:allow-write-text",
+
+    "window-state:default",
+    "window-state:allow-save-window-state",
+    "window-state:allow-restore-state"
  ]
 }
@@ -0,0 +1,26 @@
+{
+    // 如果您的配置过于复杂，可以参考 使用配置文件进行联机的办法，以下是基础的界面配置，用于快速分享联机
+    "protocol": [
+        "tcp",
+        "udp"
+    ], // 协议类型
+    
+    // easytier服务地址 - 可填写多个 方式1，逗号分隔，"xxxx.cn,yyyy.com" 方式2,数组 ["xxxx.cn","yyyy.com"] （默认选中第一个）
+    "serverUrl": "public.easytier.top:11010", 
+    "networkName": "",  // 网络名
+    "networkPassword": "", // 网络密码
+    "hostname": "configTest", // 主机名
+    "ipv4": "10.126.126.1", // IP地址(选填，下面有dhcp)
+    "disableIpv6": false, // 禁用ipv6
+    "disbleListenner": true, // 禁用端口监听
+    "disableEncryption": false, // 禁用加密
+    "noTun": false, // 禁用tun
+    "latencyfirst": false, // 延迟优先
+    "disableUdpHolePunching": false, // 禁用udp打洞
+    "disbleP2p": false,  // 禁用p2p, 强制中转
+    "dhcp": false,  // 动态分配IP
+    "devName": false, // 是否启用自定义网卡名
+    "devNameValue": "", // 网卡名(启用devName之后才生效)
+    "enableNetCardMetric": false,  // 自定义easytier每次生成的网卡跃点
+    "netCardMetricValue": 1 // 网卡跃点数量(1-9999)
+}
@@ -60,7 +60,8 @@ pub async fn fetch_releases() -> Result<Vec<Release>, Error> {

 #[tauri::command(rename_all = "snake_case")]
 fn get_core_version() -> String {
-    match Command::new("easytier/easytier-core.exe")
+    let core_path = get_tool_exe_path(String::from("\\easytier\\easytier-core.exe"));
+    match Command::new(&core_path)
        .arg("--version")
        .creation_flags(0x08000000)
        .output()
@@ -73,19 +74,27 @@ fn get_core_version() -> String {
    }
 }

-#[tauri::command(rename_all = "snake_case")]
-fn get_cli_version() -> String {
-    match Command::new("easytier/easytier-cli.exe")
-        .arg("--version")
-        .creation_flags(0x08000000)
-        .output()
-    {
-        Ok(output) => {
-            let output_str = String::from_utf8_lossy(&output.stdout);
-            return output_str.trim().to_string();
-        }
-        Err(_e) => return "".to_string(),
-    }
+// #[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"));
+//     match Command::new(&cli_path)
+//         .arg("--version")
+//         .creation_flags(0x08000000)
+//         .output()
+//     {
+//         Ok(output) => {
+//             let output_str = String::from_utf8_lossy(&output.stdout);
+//             return output_str.trim().to_string();
+//         }
+//         Err(_e) => return "".to_string(),
+//     }
+// }
+
+fn get_tool_exe_path(path: String) -> String {
+    let cur_vec = get_exe_directory();
+    let tool_path = cur_vec[1].to_string() + &path.to_string();
+    return tool_path;
 }

 #[derive(Serialize, Deserialize, Debug)]
@@ -122,7 +131,8 @@ struct MyResponse {

 #[tauri::command(rename_all = "snake_case")]
 fn get_members_by_cli() -> String {
-    match Command::new("easytier/easytier-cli.exe")
+    let cli_path = get_tool_exe_path(String::from("\\easytier\\easytier-cli.exe"));
+    match Command::new(&cli_path)
        .arg("peer")
        .arg("list")
        .creation_flags(0x08000000)
@@ -142,14 +152,17 @@ async fn download_easytier_zip(download_url: String, file_name: String) {
    let response = reqwest::get(target)
        .await
        .expect("error to download easytier url");
-    let file_path = format!("./easytier/{}", file_name);
+    let easytier_path = get_tool_exe_path(String::from("\\easytier"));
+    let file_path = format!("{}\\{}", easytier_path, file_name);
+    println!("download easytier to {}", file_path);

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

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

    let mut file = match File::create(&path) {
        Err(why) => panic!("couldn't create {}", why),
@@ -197,8 +210,8 @@ fn unzip(fname: &path::Path) {
        //         fs::create_dir_all(p).unwrap();
        //     }
        // }
-
-        let easytier_dir = path::Path::new("./easytier");
+        let easytier_path = get_tool_exe_path(String::from("\\easytier"));
+        let easytier_dir = path::Path::new(&easytier_path);
        // if !easytier_dir.exists() {
        //     fs::create_dir_all(&easytier_dir).unwrap();
        // }
@@ -225,8 +238,9 @@ fn run_command(
    let stop_signal2 = Arc::clone(&stop_signal);
    let args2 = args.clone();
    thread::spawn(move || {
+        let core_path = get_tool_exe_path(String::from("\\easytier\\easytier-core.exe"));
        // trace, debug, info, warn, error, off
-        let mut child = Command::new("easytier/easytier-core.exe")
+        let mut child = Command::new(&core_path)
            .args(args)
            .creation_flags(0x08000000)
            .stdout(Stdio::piped())
@@ -355,7 +369,7 @@ fn get_exe_directory() -> Vec<String> {
    let mut ret_vec: Vec<String> = Vec::new();
    match std::env::current_exe() {
        Ok(exe_path) => {
-            println!("Path of this executable is: {}", exe_path.display());
+            // println!("Path of this executable is: {}", exe_path.display());
            ret_vec.push(exe_path.display().to_string());
            ret_vec.push(exe_path.parent().unwrap().display().to_string());
            return ret_vec;
@@ -436,6 +450,8 @@ fn autostart_is_enabled() -> bool {
    }
 }

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

-pub const AUTOSTART_ARG: &str = "--autostart";
-
 #[cfg_attr(mobile, tauri::mobile_entry_point)]
 pub fn run() {
+    // 获取命令行参数
+    let 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_window_state::Builder::new()
+                .with_state_flags(tauri_plugin_window_state::StateFlags::SIZE)
+                .build(),
+        )
        .plugin(tauri_plugin_clipboard_manager::init())
        .plugin(tauri_plugin_fs::init())
        .plugin(tauri_plugin_autostart::init(
@@ -518,9 +540,11 @@ pub fn run() {
            let _ = app
                .get_webview_window("main")
                .expect("no main window")
-                .set_focus();
+                .set_focus()
+                .expect("failed to set focus");
        }))
-        .setup(|app| {
+        .setup(move |app| {
+            let args = args.clone();
            if cfg!(debug_assertions) {
                app.handle().plugin(
                    tauri_plugin_log::Builder::default()
@@ -547,6 +571,14 @@ pub fn run() {
                ))?)
                .icon_as_template(false)
                .build(app)?;
+
+            // 开机自启隐藏到托盘或者显示主窗口
+            if !args.contains(&String::from(TASKAUTOSTART_ARG)) {
+                let main_window = app.get_webview_window("main").unwrap();
+                main_window.show().expect("failed to show window");
+                main_window.set_focus().expect("failed to set focus");
+            }
+
            Ok(())
        })
        .manage(stop_signal_clone)
@@ -556,7 +588,6 @@ pub fn run() {
            get_core_version,
            fetch_easytier_list,
            download_easytier_zip,
-            get_cli_version,
            get_members_by_cli,
            search_pid_by_pname,
            get_exe_directory,
@@ -1,7 +1,7 @@
 {
 	"$schema": "../node_modules/@tauri-apps/cli/config.schema.json",
 	"productName": "easytier-game",
-	"version": "1.1.7",
+	"version": "1.2.1",
 	"identifier": "com.tauri.easytier-game",

 	"build": {
@@ -13,7 +13,8 @@
 	"app": {
 		"windows": [
 			{
-				"title": "easytier-game 1.1.7",
+				"title": "easytier-game 1.2.1",
+				"label": "main",
 				"minWidth": 340,
 				"width": 340,
 				"height": 305,
@@ -24,6 +25,7 @@
 				"fullscreen": false,
 				"decorations": true,
 				"center": true,
+				"visible": false,
 				"maximizable": false,
 				"transparent": false
 			}
@@ -39,6 +41,7 @@
 		"resources": [
 			"easytier/config/",
 			"easytier/icons/",
+			"easytier/config_template.json",
 			"easytier/tool/WinIPBroadcast.exe",
 			"easytier/easytier-cli.exe",
 			"easytier/easytier-core.exe",
@@ -11,7 +11,7 @@ export default defineStore("main", {
 				ipv4: "",
 				proxyNetworks: "", // 子网代理
 				autoStart: false, // 是否自动启动
-				coonectAfterStart: false, //软件打开后，是否自动连接
+				connectAfterStart: false, //软件打开后，是否自动连接
 				disableIpv6: false, // 是否禁用IPv6
 				disbleListenner: false, // 是否禁用监听
 				disableEncryption: false, // 是否禁用加密
@@ -28,33 +28,33 @@ export default defineStore("main", {
 				logLevel: "error", //日志等级
 				devName: false, //自定义网卡名
 				devNameValue: "", //自定义网卡名
+				enableNetCardMetric: false, //启用网卡自定义跃点
+				netCardMetricValue: 1 //自定义网卡跃点值
 			},
+			cidrEnable: false,
+			basePeers: ["public.easytier.top:11010"],
 			theme: false, //主题  false light true dark
 			configStartEnable: false, //使用配置文件启动
 			configPath: "", //配置文件路径
-			cidrEnable: false,
-			winipBcPid: 0,
-			winipBcStart: false,
 			winIpBcAutoStart: true,
-			basePeers: ["public.easytier.top:11010"],
+			createConfigInEasytier: false, //在easytier目录生成config.json文件吗
+
+			winipBcPid: 0,
+			winipBcStart: false
 		};
 	},
 	persist: {
-		paths: [
-			"basePeers",
-			"cidrEnable",
-			"theme",
-			"configStartEnable",
-			"configPath",
-			"winIpBcAutoStart",
-			"config.proxyNetworks",
+		// 防止持久化保存 用户使用config.json输入的无用的字段
+		pick: [
+			"config.protocol",
 			"config.serverUrl",
 			"config.networkName",
-			"config.protocol",
 			"config.networkPassword",
-			"config.disbleP2p",
+			"config.hostname",
+			"config.ipv4",
+			"config.proxyNetworks",
 			"config.autoStart",
-			"config.coonectAfterStart",
+			"config.connectAfterStart",
 			"config.disableIpv6",
 			"config.disbleListenner",
 			"config.disableEncryption",
@@ -65,13 +65,24 @@ export default defineStore("main", {
 			"config.useSmoltcp",
 			"config.disableUdpHolePunching",
 			"config.relayAllPeerrpc",
-			"config.hostname",
-			"config.ipv4",
+			"config.disbleP2p",
 			"config.dhcp",
 			"config.saveErrorLog",
 			"config.logLevel",
 			"config.devName",
 			"config.devNameValue",
+			"config.enableNetCardMetric",
+			"config.netCardMetricValue",
+
+			"cidrEnable",
+			"basePeers",
+			"theme",
+			"configStartEnable",
+			"configPath",
+			"winIpBcAutoStart",
+			"createConfigInEasytier"
 		],
-	},
+		// // 除了这些，其他都要存下来
+		// omit: ["winipBcPid", "winipBcStart"]
+	}
 });
@@ -6,6 +6,7 @@
 		"components/**/*.ts",
 		"components/**/*.js",
 		"components/**/*.vue",
+		"composables/**/*.ts",
 		"app.vue",
 		"pages/**/*.ts",
 		"pages/**/*.js",
@@ -28,16 +29,16 @@
 	"compilerOptions": {
 		"target": "ESNext",
 		"module": "ESNext",
+		"moduleResolution": "Node",
 		// 	"types": ["element-plus/global"]
 		"resolveJsonModule": true,
 		// 从 Vue 3.4 开始，Vue 不再隐式注册全局 JSX 命名空间。要指示 TypeScript 使用 Vue 的 JSX 类型定义，请确保在你的 tsconfig.json 中包含以下内容
 		"jsx": "preserve",
 		"jsxImportSource": "vue",
-		"types": ["@pinia/nuxt", "vite/client", "element-plus/global"],
+		"types": ["@pinia/nuxt", "vite/client", "element-plus/global", "pinia-plugin-persistedstate"],
 		"allowJs": true, // 允许编译器编译JS，JSX文件
-		"checkJs": true, // 允许在JS文件中报错，通常与allowJS一起使用
+		"checkJs": false, // 允许在JS文件中报错，通常与allowJS一起使用
 		"esModuleInterop": true, // 允许export=导出，由import from 导入
-
 		"lib": ["DOM", "ESNext"],
 		"allowSyntheticDefaultImports": true
 	}
@@ -1,5 +1,6 @@
 interface ImportMetaEnv {
 	readonly VITE_CONFIG_PATH: string;
+	readonly VITE_CONFIG_FILE_NAME: string;
 }

 interface ImportMeta {
@@ -1,17 +1,5 @@
-import { ElMessage } from "element-plus";
-import Clipboard from "vue-clipboard3";
-
 export const ENV = import.meta.env;

-export const clipBoardCopy = async (text: string) => {
-	const { toClipboard } = Clipboard();
-	try {
-		await toClipboard(text);
-		ElMessage.success("复制成功");
-	} catch (e) {
-		ElMessage.error("复制失败");
-	}
-};

 //防抖
 export const bounce = (time = 3000) => {
Author	SHA1	Message	Date
黑先森	2d4a44740a	增加窗口保存需要的权限，修改启动自动联机错误的英文拼写	2024-11-15 17:25:14 +08:00
黑先森	f0633761a0	保存窗口的大小状态，优化成员列表显示，开机自启隐藏于托盘，服务器地址输入支持带协议 [protocol]://	2024-11-15 16:22:21 +08:00
leizi97	4bedec63ca	开机自启功能修复完成	2024-11-15 00:13:49 +08:00
黑先森	ab67ba94a3	config.json存储优化,新增设置网卡跃点功能,以及其他bug修复 - 修复服务器地址过长导致无法删除地址的问题 - 新增设置网卡跃点功能 - 优化config.json serverUrl的输入格式，可数组或字符串逗号分隔	2024-11-14 14:57:42 +08:00
黑先森	8e6f8d602e	readme修改	2024-11-13 16:50:53 +08:00
黑先森	92d25ab907	新增生成config.json界面基础配置的高级选项	2024-11-13 16:42:55 +08:00
黑先森	1c8314c6fa	更新pinia插件的使用	2024-11-12 20:23:45 +08:00
黑先森	b352d49e0b	manage package 开发环境和生成环境正常运行 remove defu dayjs xlsx @pinia-plugin-persistedstate/nuxt vue qs @types/qs add pinia-plugin-persistedstate update nuxt pinia element-plus(/nuxt) @vitejs/plugin-vue-jsx 修改nuxt.config.ts配置	2024-11-12 18:26:32 +08:00