开机自启功能修复完成

- 修复服务器地址过长导致无法删除地址的问题
- 新增设置网卡跃点功能
- 优化config.json serverUrl的输入格式，可数组或字符串逗号分隔

.gitignore

@@ -10,7 +10,5 @@ dist
 .idea
 .vscode
 release
-src-tauri/easytier-cli.exe
+
-src-tauri/easytier-core.exe
+src-tauri/easytier/logs
-src-tauri/Packet.dll
-src-tauri/wintun.dll

README.md

@@ -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组网工具开发，界面清晰简单

composables/configJson.ts

@@ -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,
+			coonectAfterStart,
+			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失败`);
+	}
+};

composables/log.ts

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

composables/tray.ts

@@ -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) {

composables/windows.ts

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

env/.env.dev

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

env/.env.prod

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

nuxt.config.ts

@@ -1,16 +1,7 @@
 import { defineNuxtConfig } from "nuxt/config";
-import fs from "fs";
 import path from "path";
 import vueJSX from "@vitejs/plugin-vue-jsx";
-const isDev = process?.argv?.[2] == "_dev" || process?.argv?.[2] == "dev";
+
-const optimizeDepsElementPlusIncludes = ["element-plus/es"];
-fs.readdirSync("node_modules/element-plus/es/components").map(dirname => {
-	fs.access(`node_modules/element-plus/es/components/${dirname}/style/css.mjs`, err => {
-		if (!err) {
-			optimizeDepsElementPlusIncludes.push(`element-plus/es/components/${dirname}/style/css`);
-		}
-	});
-});
 export default defineNuxtConfig({
 	ssr: false,
 
@@ -22,8 +13,19 @@ export default defineNuxtConfig({
 		autoImport: false
 	},
 
-	css: ["~/assets/css/main.css", 'element-plus/theme-chalk/dark/css-vars.css'],
+	css: ["~/assets/css/main.css", "element-plus/theme-chalk/dark/css-vars.css"],
-	modules: ["@element-plus/nuxt", "@pinia/nuxt", "@pinia-plugin-persistedstate/nuxt", "@nuxtjs/tailwindcss"],
+	modules: [
+		"@element-plus/nuxt",
+		"@pinia/nuxt",
+		[
+			"pinia-plugin-persistedstate/nuxt",
+			{
+				key: "__glj_persisted_%id",
+				storage: "localStorage"
+			}
+		],
+		"@nuxtjs/tailwindcss"
+	],
 
 	alias: {
 		"@": path.resolve(__dirname, "./")
@@ -44,12 +46,10 @@ export default defineNuxtConfig({
 	},
 
 	vite: {
-		plugins: [
+		plugins: [vueJSX({})],
-			vueJSX({}),
-		],
 		envDir: "env",
 		optimizeDeps: {
-			include: [...optimizeDepsElementPlusIncludes]
+			// include: [...optimizeDepsElementPlusIncludes]
 		},
 		// prevent vite from obscuring rust errors
 		clearScreen: false,
@@ -84,7 +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"
 });

package.json

@@ -3,44 +3,35 @@
 	"private": true,
 	"author": "leizi97",
 	"description": "A simple network initiator based on Easytier",
-	"version": "1.1.6",
+	"version": "1.2.0",
 	"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.7.0",
-		"@pinia/nuxt": "^0.5.1",
+		"@tauri-apps/api": "^2.1.1",
-		"@tauri-apps/api": "^2.0.2",
+		"@tauri-apps/cli": "^2.1.0",
-		"@tauri-apps/cli": "^2.0.2",
+		"@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",
 		"@types/lodash-es": "^4.17.12",
-		"@types/qs": "^6.9.15",
+		"@vitejs/plugin-vue-jsx": "^4.1.0",
-		"@vitejs/plugin-vue-jsx": "^3.1.0",
 		"@vueuse/core": "^11.2.0",
-		"dayjs": "^1.11.10",
+		"element-plus": "^2.8.7",
-		"defu": "^6.1.4",
-		"element-plus": "^2.8.6",
 		"less": "^4.2.0",
 		"lodash-es": "^4.17.21",
-		"nuxt": "^3.11.2",
+		"nuxt": "^3.13.2",
-		"pinia": "^2.1.7",
+		"pinia": "^2.2.6",
+		"pinia-plugin-persistedstate": "^4.1.3",
 		"postcss": "^8.4.38",
-		"qs": "^6.12.0",
+		"typescript": "^5.6.3",
-		"typescript": "^5.4.5",
+		"vue-clipboard3": "^2.0.0"
-		"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"
 	}
 }

pages/advance.vue

@@ -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.coonectAfterStart">软件启动后，自动"启动联机"(搭配开机自启，无感联机)</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>

pages/index.vue

@@ -2,218 +2,202 @@
 	<ElForm
 		size="small"
 		label-position="top"
-		:model="config"
+		:model="config">
-	>
 		<!-- element-loading-custom-class="config-start"
 			v-loading="mainStore.configStartEnable"
 			:element-loading-spinner="'<path />'"
 			element-loading-text="-------已经启用配置文件，界面配置不再生效-------" -->
 		<!-- <div> -->
-			<ElFormItem
+		<ElFormItem
-				label="服务器"
+			label="服务器"
-				prop="serverUrl"
+			prop="serverUrl">
-			>
+			<template #label>
-				<template #label>
+				<div class="flex items-center gap-[0_5px]">
-					<div class="flex items-center gap-[0_5px]">
+					<div>服务器</div>
-						<div>服务器</div>
+					<span>-</span>
-						<span>-</span>
+					<ElTag
-						<ElTag
+						effect="dark"
-							effect="dark"
+						:type="data.isSuccessGetIp ? 'success' : 'info'">
-							:type="data.isSuccessGetIp ? 'success' : 'info'"
+						{{ data.isSuccessGetIp ? "联机成功" : data.isStart && !data.isSuccessGetIp ? "联机中" : "未联机" }}
-						>
+					</ElTag>
-							{{ data.isSuccessGetIp ? "联机成功" : data.isStart && !data.isSuccessGetIp ? "联机中" : "未联机" }}
+					<ElButton
-						</ElTag>
+						v-if="!data.coreVersion"
-						<ElButton
+						@click="getCoreVersion(true)">
-							v-if="!data.coreVersion"
+						获取内核版本
-							@click="getCoreVersion(true)"
+					</ElButton>
-						>
+					<ElTag
-							获取内核版本
+						v-else
-						</ElButton>
+						type="info">
-						<ElTag
+						{{ data.coreVersion }}
-							v-else
+					</ElTag>
-							type="info"
+					<ElPopconfirm
-						>
+						width="325"
-							{{ data.coreVersion }}
+						cancel-button-text="取消"
-						</ElTag>
+						confirm-button-text="继续"
-						<ElPopconfirm
+						title="内核从github下载，需要出国工具，可能下载缓慢或失败，是否继续?
-							width="325"
-							cancel-button-text="取消"
-							confirm-button-text="继续"
-							title="内核从github下载，需要出国工具，可能下载缓慢或失败，是否继续?
 						也可以从官方群里手动下载后解压到easytier-game.exe同级目录下的easytier目录里,全部覆盖即可"
-							@confirm="handleUpdateCore"
+						@confirm="handleUpdateCore">
-						>
+						<template #reference>
-							<template #reference>
+							<ElButton
-								<ElButton
+								:disabled="data.isStart"
-									:disabled="data.isStart"
+								:loading="data.update"
-									:loading="data.update"
+								type="warning"
-									type="warning"
+								size="small">
-									size="small"
+								{{ data.coreVersion ? "更新内核" : "下载内核" }}
-								>
+							</ElButton>
-									{{ data.coreVersion ? "更新内核" : "下载内核" }}
+						</template>
-								</ElButton>
+					</ElPopconfirm>
-							</template>
+				</div>
-						</ElPopconfirm>
+			</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">
+							<ElOption
+								v-for="item in protocols"
+								:key="item"
+								:label="item"
+								:value="item"></ElOption>
+						</ElSelect>
 					</div>
 				</template>
-				<ElSelect
+				<ElOption
-					allow-create
+					v-for="item in mainStore.basePeers"
-					filterable
+					:key="item"
-					default-first-option
+					:label="item"
-					v-model="config.serverUrl"
+					:value="item">
-					@change="handleServerUrlChange"
+					<div class="flex items-center gap-[20px] overflow-hidden flex-nowrap max-w-[calc(100vw-62px)]">
-				>
+						<ElTooltip :content="item">
-					<template #prefix>
+							<p class="truncate">{{ item }}</p>
-						<div :class="config.protocol && config.protocol.length > 1 ? 'w-[120px]' : 'w-[80px]'">
+						</ElTooltip>
-							<ElSelect
+						<div class="flex-shrink-0 ml-auto">
-								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>
 							<ElButton
 								@click.stop="handleDeleteServerUrl(item)"
 								round
 								:icon="Delete"
-								type="danger"
+								type="danger"></ElButton>
-							></ElButton>
 						</div>
-					</ElOption>
+					</div>
-				</ElSelect>
+				</ElOption>
-			</ElFormItem>
+			</ElSelect>
-			<div class="flex flex-wrap gap-[0_10px] items-center">
+		</ElFormItem>
-				<div class="flex-1">
+		<div class="flex flex-wrap gap-[0_10px] items-center">
-					<ElFormItem label="网络名">
+			<div class="flex-1">
-						<template #label>
+				<ElFormItem 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="主机名">
 					<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"
+						placeholder="请输入网络名"
-						v-model="config.hostname"
+						v-model="config.networkName"></ElInput>
-					></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 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 gap-[0_10px]">
+		<div class="flex items-start">
-			<div class="w-[122px]">
+			<div>
 				<div>
 					<ElDropdown
 						@command="handleStartCommand"
 						split-button
+						trigger="click"
 						size="default"
 						:type="!data.isStart ? 'primary' : 'danger'"
 						:disabled="data.startLoading || !data.coreVersion || data.update"
-						@click="handleConnection"
+						@click="handleConnection">
-					>
 						{{ !data.isStart ? "启动联机" : "停止联机" }}
 						<template #dropdown>
 							<ElDropdownMenu>
 								<ElDropdownItem
 									command="import_config"
-									:icon="Link"
+									:icon="Link">
-								>
 									导入配置
 								</ElDropdownItem>
 								<ElDropdownItem
 									command="share_config"
-									:icon="Share"
+									:icon="Share">
-								>
 									分享配置
 								</ElDropdownItem>
 								<ElDropdownItem
 									:icon="Tools"
 									command="toml"
-									:disabled="data.isStart"
+									:disabled="data.isStart">
-								>
 									使用外部配置文件
 								</ElDropdownItem>
 							</ElDropdownMenu>
@@ -223,55 +207,47 @@
 				<div class="mt-[6px] pl-[2px]">
 					<ElTooltip
 						placement="left"
-						content="日志"
+						content="日志">
-					>
 						<ElButton
 							:type="!data.logVisible ? 'info' : 'warning'"
 							@click="handleShowLogDialog"
 							:icon="List"
 							size="small"
-							plain
+							plain></ElButton>
-						></ElButton>
 					</ElTooltip>
 					<ElTooltip
 						placement="left"
-						content="成员"
+						content="成员">
-					>
 						<ElButton
 							@click="handleShowMemberDialog"
 							:icon="UserFilled"
 							plain
 							type="success"
-							size="small"
+							size="small"></ElButton>
-						></ElButton>
 					</ElTooltip>
 				</div>
 			</div>
-			<div>
+			<div class="ml-auto">
 				<ElCheckbox
 					v-model="config.disbleP2p"
-					size="small"
+					size="small">
-				>
 					强制中转
 				</ElCheckbox>
 				<ElCheckbox
-					@change="handleAutoStart"
+					@change="handleAutoStartByTask"
 					:model-value="config.autoStart"
-					size="small"
+					size="small">
-				>
 					开机自启
 				</ElCheckbox>
 				<div>
 					<ElButton
 						@click="handleShowCidrDialog"
-						:icon="Share"
+						:icon="Share">
-					>
 						子网代理
 					</ElButton>
 					<ElButton
 						@click="handleShowAdvanceDialog"
-						:icon="Setting"
+						:icon="Setting">
-					>
 						高级选项
 					</ElButton>
 				</div>
@@ -282,17 +258,15 @@
 							type="primary"
 							size="small"
 							:icon="MagicStick"
-							@click="handleShowToolDialog"
+							@click="handleShowToolDialog">
-						>
 							增强工具
 						</ElButton>
 					</div>
 					<ElLink
-						class="!text-[10px] pb-[2px] ml-[8px]"
+						class="!text-[9px] pb-[2px] ml-[8px] truncate"
 						type="info"
 						:underline="false"
-						@click="open('https://github.com/EasyTier/EasytierGame')"
+						@click="open('https://github.com/EasyTier/EasytierGame')">
-					>
 						EasytierGame主页
 					</ElLink>
 				</div>
@@ -302,27 +276,26 @@
 	<ElDialog
 		width="95%"
 		top="10px"
+		append-to-body
+		:z-index="10"
 		class="!mb-0"
 		v-model="importConfigData.visible"
 		:close-on-press-escape="false"
-		title="导入分享"
+		title="导入分享">
-	>
 		<ElInput
 			type="textarea"
 			:rows="6"
 			placeholder="请粘贴分享的配置"
-			v-model="importConfigData.data"
+			v-model="importConfigData.data"></ElInput>
-		></ElInput>
 		<template #footer>
 			<div>
-				<el-text type="danger">导入成功后，您当前的配置将被完全替换</el-text>
+				<el-text type="danger">导入成功后，您当前的部分配置将被替换</el-text>
 			</div>
 			<div class="text-right">
 				<ElButton
 					size="small"
 					@click="handleStartImport"
-					type="primary"
+					type="primary">
-				>
 					导入
 				</ElButton>
 			</div>
@@ -331,11 +304,12 @@
 	<ElDialog
 		width="95%"
 		top="30px"
+		append-to-body
+		:z-index="10"
 		class="!mb-0"
 		v-model="configStart.visible"
 		:close-on-press-escape="false"
-		title="配置文件启动"
+		title="配置文件启动">
-	>
 		<div class="flex items-center gap-[0_4px]">
 			<span>启用</span>
 			<ElSwitch v-model="mainStore.configStartEnable"></ElSwitch>
@@ -344,16 +318,14 @@
 			</ElTooltip>
 			<ElButton
 				@click="openConfigDir"
-				size="small"
+				size="small">
-			>
 				打开配置目录
 			</ElButton>
 			<ElButton
 				@click="handleStartCommand('toml')"
 				type="primary"
 				:icon="RefreshRight"
-				size="small"
+				size="small">
-			>
 				刷新
 			</ElButton>
 		</div>
@@ -361,14 +333,12 @@
 			<ElSelect
 				v-model="mainStore.configPath"
 				no-data-text="目录没有配置文件"
-				placeholder="选择配置文件"
+				placeholder="选择配置文件">
-			>
 				<ElOption
 					v-for="item in configStart.list"
 					:key="item.path"
 					:value="item.path"
-					:label="item.name"
+					:label="item.name"></ElOption>
-				></ElOption>
 			</ElSelect>
 		</div>
 		<template #footer>
@@ -376,8 +346,7 @@
 				<ElButton
 					size="small"
 					@click="configStart.visible = false"
-					type="danger"
+					type="danger">
-				>
 					关闭
 				</ElButton>
 			</div>
@@ -393,14 +362,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;
 
@@ -429,25 +401,26 @@
 		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 }>({
 		visible: false,
 		loading: false,
-		list: [] //配置文件列表
+		list: [], //配置文件列表
 	});
 
 	const importConfigData = reactive<{ data: ""; [key: string]: any }>({
 		visible: false,
 		loading: false,
-		data: ""
+		data: "",
 	});
 
 	const closePrevent = async () => {
 		const appWindow = getCurrentWindow();
 		if (appWindow.label == "main") {
-			appWindow.onCloseRequested(async event => {
+			appWindow.onCloseRequested(async (event) => {
 				// console.log(appWindow.label);
 				if (!is_close) {
 					// console.log(1);
@@ -467,11 +440,11 @@
 			}
 			newBasePeers.splice(idx, 1);
 		}
-		mainStore.basePeers = [...new Set([...newBasePeers])];
+		mainStore.basePeers = uniq([...newBasePeers]);
 	};
 
 	const handleServerUrlChange = () => {
-		mainStore.basePeers = [...new Set([config.serverUrl, ...mainStore.basePeers])];
+		mainStore.basePeers = uniq([config.serverUrl, ...mainStore.basePeers]);
 	};
 
 	const listenObj: { [key: string]: any } = {
@@ -480,12 +453,14 @@
 		unListenConfigStart: null,
 		thread_id: null,
 		async listenOutput() {
-			const appWindow = getCurrentWindow();
+			// const appWindow = getCurrentWindow();
-			const unListen = await listen("command-output", async event => {
+			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,17 +475,36 @@
 							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;
 		},
 		async listenThreadId() {
-			const unListen = await listen("thread-id", event => {
+			const unListen = await listen("thread-id", (event) => {
 				if (event.payload) {
 					this.thread_id = event.payload;
 				}
@@ -518,14 +512,14 @@
 			this.unListenThreadId = unListen;
 		},
 		async listenConfigStart() {
-			const unListen = await listen("config", event => {
+			const unListen = await listen("config", (event) => {
 				// console.log("config", event.payload);
 				const ipv4 = config.ipv4;
 				mainStore.$patch(event.payload as any);
 				config.ipv4 = ipv4;
 			});
 			this.unListenConfigStart = unListen;
-		}
+		},
 	};
 
 	const unListenAll = async () => {
@@ -583,6 +577,7 @@
 	const getReleaseList = async () => {
 		const list = await invoke("fetch_easytier_list");
 		data.releaseList = list as never[];
+		console.log(data.releaseList);
 	};
 
 	const handleAutoStart = async () => {
@@ -629,17 +624,23 @@
 
 	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) {
 			await invoke("spawn_autostart", { enabled: false });
-			await tauriAutoStart.disable();
+			const is_enable_by_task = (await invoke("autostart_is_enabled")) as boolean;
-			config.autoStart = false;
+			config.autoStart = is_enable_by_task;
 		}
 	};
 
@@ -650,10 +651,60 @@
 		}
 	};
 
+	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) {
+					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();
@@ -700,7 +751,7 @@
 		}
 		if (config.serverUrl) {
 			const formatUrl = config.serverUrl.replace(/\\/g, "/");
-			args.push("--peers", ...config.protocol.map(protocol => `${protocol}://${formatUrl}`));
+			args.push("--peers", ...config.protocol.map((protocol) => `${protocol}://${formatUrl}`));
 		}
 		if (config.disbleP2p) {
 			args.push("--disable-p2p");
@@ -716,8 +767,8 @@
 			const reg = /\d+\.\d+\.\d+\.\d+\/\d+/g;
 			const formatProxyNetworks = config.proxyNetworks
 				.split("\n")
-				.map(item => item.trim())
+				.map((item) => item.trim())
-				.filter(item => item && reg.test(item));
+				.filter((item) => item && reg.test(item));
 			args.push("--proxy-networks", ...formatProxyNetworks);
 			config.proxyNetworks = formatProxyNetworks.join("\n");
 		}
@@ -761,7 +812,7 @@
 			config.ipv4 = "";
 		}
 		const memberDialog = await getAllWebviewWindows();
-		const memberDialogs = memberDialog.filter(item => item.label === "member");
+		const memberDialogs = memberDialog.filter((item) => item.label === "member");
 		if (memberDialogs && memberDialogs.length > 0) {
 			data.memberVisible = false;
 			for (const memberDialog of memberDialogs) {
@@ -784,7 +835,7 @@
 			if (!args || args.length <= 0) {
 				return ElMessage.error("无配置");
 			}
-			if(args[0] === "-c") {
+			if (args[0] === "-c") {
 				ElMessage.warning({
 					message: "使用配置文件中.",
 					duration: 5000,
@@ -796,7 +847,7 @@
 			await listenObj.listenOutput();
 
 			await invoke("run_command", {
-				args
+				args,
 			});
 		}
 	};
@@ -810,10 +861,10 @@
 			if (isExists) {
 				const entries = await readDir(path, { baseDir: BaseDirectory.Resource });
 				configStart.list = entries
-					.filter(item => item.isFile)
+					.filter((item) => item.isFile)
-					.map(item => ({
+					.map((item) => ({
 						name: item.name,
-						path: `${path}${item.name}`
+						path: `${path}${item.name}`,
 					})) as any;
 			} else {
 				mainStore.configStartEnable = false;
@@ -825,9 +876,24 @@
 		}
 		if (command === "share_config") {
 			try {
-				await writeText(btoa(JSON.stringify({ config: mainStore.config })));
+				const {
+					proxyNetworks,
+					autoStart,
+					coonectAfterStart,
+					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) {
+				console.log(err);
 				ElMessage.error("分享失败");
 			}
 		}
@@ -841,14 +907,20 @@
 		try {
 			await ElMessageBox.confirm("确定导入?", "提示", {
 				confirmButtonText: "确定",
-				cancelButtonText: "取消"
+				cancelButtonText: "取消",
+			});
+			const payload = JSON.parse(decodeURIComponent(atob(importConfigData.data)));
+			mainStore.$patch({
+				config: {
+					...mainStore.config,
+					...payload.config,
+				},
 			});
-			const payload = JSON.parse(atob(importConfigData.data));
-			mainStore.$patch(payload);
 			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("导入失败");
 			}
@@ -888,7 +960,7 @@
 				title: "成员列表",
 				width: 470,
 				height: 380,
-				url: "#/member"
+				url: "#/member",
 			},
 			() => {
 				data.memberVisible = true;
@@ -907,7 +979,7 @@
 				width: 600,
 				height: 380,
 				resizable: false,
-				url: "#/log"
+				url: "#/log",
 			},
 			(_, appWindow) => {
 				data.logVisible = true;
@@ -930,7 +1002,7 @@
 				width: 600,
 				height: 380,
 				resizable: false,
-				url: "#/cidr"
+				url: "#/cidr",
 			},
 			(_, appWindow) => {
 				data.cidrVisible = true;
@@ -949,7 +1021,7 @@
 				width: 600,
 				height: 380,
 				resizable: false,
-				url: "#/advance"
+				url: "#/advance",
 			},
 			(_, appWindow) => {
 				data.advanceVisible = true;
@@ -968,7 +1040,7 @@
 				width: 460,
 				height: 480,
 				resizable: true,
-				url: "#/tool"
+				url: "#/tool",
 			},
 			(_, appWindow) => {
 				data.toolVisible = true;

pages/tool.vue

@@ -144,7 +144,7 @@
 					<ElInputNumber
 						controls-position="right"
 						size="small"
-                        :precision="0"
+						:precision="0"
 						v-model="data.pingNum"
 						:min="1"
 						:max="10"
@@ -155,6 +155,7 @@
 					</ElInputNumber>
 					<ElButton
 						size="small"
+						:disabled="data.isPing"
 						@click="handleTestPing"
 					>
 						Ping一下
@@ -181,6 +182,7 @@
 	import useMainStore from "@/stores/index";
 	import { handleWinipBcStart, initStartWinIpBroadcast } from "@/composables/netcard";
 	import { getCurrentWindow } from "@tauri-apps/api/window";
+	import { isValidIP } from "~/utils";
 
 	const mainStore = useMainStore();
 	const data = reactive({
@@ -189,6 +191,7 @@
 		pingNum: 1,
 		winipBcStart: false,
 		pingIp: "",
+		isPing: false,
 		pingLog: "",
 		firewallStatus: {
 			domain: false,
@@ -228,28 +231,41 @@
 		}
 	};
 
+	const awaitTime = (time: number) => {
+		return new Promise(res => {
+			setTimeout(res, time);
+		});
+	};
+
 	const handleTestPing = async () => {
-		/^((\d|[1-9]\d|1\d\d|2[0-4]\d|25[0-5])\.){3}(\d|[1-9]\d|1\d\d|2[0-4]\d|25[0-5])(?::(?:[0-9]|[1-9][0-9]{1,3}|[1-5][0-9]{4}|6[0-4][0-9]{3}|65[0-4][0-9]{2}|655[0-2][0-9]|6553[0-5]))?$/;
+		// const is = isValidIP(data.pingIp);
 		if (data.pingIp) {
 			data.pingLog = "";
+			data.isPing = true;
 			try {
 				for (let i = 0; i < data.pingNum; i++) {
 					const output = await Command.create("ping", ["-n", "1", data.pingIp], {
 						encoding: "gb2312"
 					}).execute();
-
-					data.pingLog = data.pingLog.slice(-1000);
 					if (output.stdout) {
-						data.pingLog += output.stdout.split("\n")[2];
+						data.pingLog += `${i + 1} - ${output.stdout.split("\n")[2]}`;
 					}
 					if (output.stderr) {
-						data.pingLog += output.stderr;
+						data.pingLog += `${i + 1}error - ${output.stderr}`;
+					}
+					if(i != data.pingNum - 1) {
+						await awaitTime(1000);
 					}
 				}
+				data.pingLog += '完毕'
 			} catch (err) {
 				ElMessage.error("Ping发生错误");
 				console.log(err);
+			} finally {
+				data.isPing = false;
 			}
+		}else {
+			ElMessage.error("请输入正确的IP");
 		}
 	};
 
@@ -306,6 +322,7 @@
 				}
 			}
 		} catch (err) {
+			// netsh advfirewall firewall add rule name="EXE名称" dir=out action=allow program="EXE绝对路径"
 			ElMessage.error("获取防火墙状态失败");
 			console.log(err);
 		}
@@ -318,6 +335,7 @@
 	});
 
 	onMounted(() => {
+		data.pingIp = mainStore.config.ipv4;
 		initStartWinIpBroadcast();
 	});
 </script>

plugins/pinia.ts

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

src-tauri/.gitignore

@@ -2,4 +2,5 @@
 # will have compiled files and executables
 /target/
 /gen/schemas
-/easytier/
+/easytier/logs
+/easytier/logs/*.*

src-tauri/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "easytier-game"
-version = "1.1.6"
+version = "1.2.0"
 homepage = "https://github.com/EasyTier/EasyTier"
 repository = "https://github.com/EasyTier/EasytierGame"
 description = "A simple network initiator based on Easytier"
@@ -18,20 +18,20 @@ name = "app_lib"
 crate-type = ["staticlib", "cdylib", "rlib"]
 
 [build-dependencies]
-tauri-build = { version = "2.0.2", features = [] }
+tauri-build = { version = "2.0.3", features = [] }
 # prost-build = "0.13.2"
 
 [dependencies]
 serde_json = "1.0"
 serde = { version = "1.0", features = ["derive"] }
 log = "0.4"
-tauri = { version = "2.0.6", features = [
+tauri = { version = "2.1.1", features = [
     "tray-icon",
     "image-png",
     "image-ico",
 ] }
 
-tauri-plugin-log = "2.0.1"
+tauri-plugin-log = "2.0.2"
 tauri-plugin-shell = "2.0.2"
 reqwest = { version = "0.12", features = ["json"] }
 zip = "2.2.0"
@@ -39,7 +39,7 @@ 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.0-rc"
+tauri-plugin-clipboard-manager = "2.0.2"
 # prost = "0.13"
 # prost-types = "0.13"
 

src-tauri/capabilities/default.json

@@ -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,6 +84,8 @@
     "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"

src-tauri/easytier/config_template.json

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

src-tauri/src/lib.rs

@@ -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")]
+// #[tauri::command(rename_all = "snake_case")]
-fn get_cli_version() -> String {
+// #[warn(dead_code)]
-    match Command::new("easytier/easytier-cli.exe")
+// fn get_cli_version() -> String {
-        .arg("--version")
+//     let cli_path = get_tool_exe_path(String::from("\\easytier\\easytier-cli.exe"));
-        .creation_flags(0x08000000)
+//     match Command::new(&cli_path)
-        .output()
+//         .arg("--version")
-    {
+//         .creation_flags(0x08000000)
-        Ok(output) => {
+//         .output()
-            let output_str = String::from_utf8_lossy(&output.stdout);
+//     {
-            return output_str.trim().to_string();
+//         Ok(output) => {
-        }
+//             let output_str = String::from_utf8_lossy(&output.stdout);
-        Err(_e) => return "".to_string(),
+//             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_path = get_tool_exe_path(String::from("\\easytier"));
-        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();
         // }
@@ -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,10 +515,11 @@ 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!();
@@ -518,9 +535,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 +566,13 @@ pub fn run() {
                 ))?)
                 .icon_as_template(false)
                 .build(app)?;
+            // 开机自启隐藏到托盘
+            // if args.contains(&String::from(TASKAUTOSTART_ARG)) {
+            //     app.get_webview_window("main")
+            //     .expect("no main window to hide")
+            //     .hide()?;
+            // }
+
             Ok(())
         })
         .manage(stop_signal_clone)
@@ -556,7 +582,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,

src-tauri/tauri.conf.json

@@ -1,7 +1,7 @@
 {
 	"$schema": "../node_modules/@tauri-apps/cli/config.schema.json",
 	"productName": "easytier-game",
-	"version": "1.1.6",
+	"version": "1.2.0",
 	"identifier": "com.tauri.easytier-game",
 
 	"build": {
@@ -13,10 +13,14 @@
 	"app": {
 		"windows": [
 			{
-				"title": "easytier-game 1.1.6",
+				"title": "easytier-game 1.2.0",
-				"width": 335,
+				"minWidth": 340,
+				"width": 340,
 				"height": 305,
-				"resizable": false,
+				"minHeight": 305,
+				"maxHeight": 305,
+				"maxWidth": 360,
+				"resizable": true,
 				"fullscreen": false,
 				"decorations": true,
 				"center": true,
@@ -35,6 +39,7 @@
 		"resources": [
 			"easytier/config/",
 			"easytier/icons/",
+			"easytier/config_template.json",
 			"easytier/tool/WinIPBroadcast.exe",
 			"easytier/easytier-cli.exe",
 			"easytier/easytier-core.exe",

stores/index.ts

@@ -28,31 +28,31 @@ 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: [
+		// 防止持久化保存 用户使用config.json输入的无用的字段
-			"basePeers",
+		pick: [
-			"cidrEnable",
+			"config.protocol",
-			"theme",
-			"configStartEnable",
-			"configPath",
-			"winIpBcAutoStart",
-			"config.proxyNetworks",
 			"config.serverUrl",
 			"config.networkName",
-			"config.protocol",
 			"config.networkPassword",
-			"config.disbleP2p",
+			"config.hostname",
+			"config.ipv4",
+			"config.proxyNetworks",
 			"config.autoStart",
 			"config.coonectAfterStart",
 			"config.disableIpv6",
@@ -65,13 +65,24 @@ export default defineStore("main", {
 			"config.useSmoltcp",
 			"config.disableUdpHolePunching",
 			"config.relayAllPeerrpc",
-			"config.hostname",
+			"config.disbleP2p",
-			"config.ipv4",
 			"config.dhcp",
 			"config.saveErrorLog",
 			"config.logLevel",
 			"config.devName",
 			"config.devNameValue",
+			"config.enableNetCardMetric",
+			"config.netCardMetricValue",
+
+			"cidrEnable",
+			"basePeers",
+			"theme",
+			"configStartEnable",
+			"configPath",
+			"winIpBcAutoStart",
+			"createConfigInEasytier"
 		],
-	},
+		// // 除了这些，其他都要存下来
+		// omit: ["winipBcPid", "winipBcStart"]
+	}
 });

tsconfig.json

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

typings/index.d.ts

@@ -1,5 +1,6 @@
 interface ImportMetaEnv {
 	readonly VITE_CONFIG_PATH: string;
+	readonly VITE_CONFIG_FILE_NAME: string;
 }
 
 interface ImportMeta {

utils/index.ts

@@ -1,18 +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) => {
@@ -79,36 +66,43 @@ export const ATJ = (promise: Promise<any>, errorExt: string | undefined = undefi
 
 export const parsePeerInfo = (content: string) => {
 	// 将表格字符串分割成行
-	const lines = content.split('\n')
+	const lines = content.split("\n");
-  
+
 	// 提取表头（keys）
 	const headers = lines[1]
-	  .split('│')
+		.split("│")
-	  .slice(1, -1)
+		.slice(1, -1)
-	  .map((h) => h.trim())
+		.map(h => h.trim());
-  
+
 	// 初始化结果数组
-	const result: any[] = []
+	const result: any[] = [];
-  
+
 	// 遍历数据行
 	for (let i = 3; i < lines.length - 1; i += 2) {
-	  if (lines[i].trim() === '') continue // 跳过空行
+		if (lines[i].trim() === "") continue; // 跳过空行
-  
+
-	  // 分割每一行的数据
+		// 分割每一行的数据
-	  const values = lines[i]
+		const values = lines[i]
-		.split('│')
+			.split("│")
-		.slice(1, -1)
+			.slice(1, -1)
-		.map((v) => v.trim())
+			.map(v => v.trim());
-  
+
-	  // 创建对象并添加到结果数组
+		// 创建对象并添加到结果数组
-	  const obj: any = {}
+		const obj: any = {};
-	  headers.forEach((header, index) => {
+		headers.forEach((header, index) => {
-		obj[header] = values[index] === '-' || values[index] === '' ? null : values[index]
+			obj[header] = values[index] === "-" || values[index] === "" ? null : values[index];
-	  })
+		});
-  
+
-	  // 每行数据都作为一个新对象添加到结果数组中
+		// 每行数据都作为一个新对象添加到结果数组中
-	  result.push(obj)
+		result.push(obj);
 	}
-  
+
-	return result
+	return result;
-  }
+};
+
+export function isValidIP(ip: string) {
+	const ipv4Pattern =
+		/^(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)$/;
+	const ipv6Pattern = /^(?:[A-Fa-f0-9]{1,4}:){7}[A-Fa-f0-9]{1,4}$/;
+	return ipv4Pattern.test(ip) || ipv6Pattern.test(ip);
+}