去除无用的库，新增配置管理功能 #4，界面体验优化

assets/css/main.css

@@ -55,5 +55,12 @@ html.dark body {
 }
 
 .el-select-dropdown__wrap {
-	max-height: 150px!important;
+	max-height: 138px!important;
+}
+
+.el-popper:not(.is-pure) {
+	font-size: 10px!important;
+	line-height: 1.2em!important;
+	padding: 5px!important;
+	font-weight: lighter!important;
 }

build.bat

@@ -1,9 +1,9 @@
 rustup default nightly
-@echo 使用rust nightly构建支持win7的版本，请先将根目录的windows.0.48.5 放入以下目录
+rem 使用rust nightly构建支持win7的版本，请先将根目录的windows.0.48.5 放入以下目录
-@echo C:\Program Files\Microsoft Visual Studio\2022\Community\VC\Tools\MSVC\你自己的版本\lib\x64
+rem C:\Program Files\Microsoft Visual Studio\2022\Community\VC\Tools\MSVC\你自己的版本\lib\x64
-@echo C:\Program Files\Microsoft Visual Studio\2022\Community\VC\Tools\MSVC\你自己的版本\lib\x86
+rem C:\Program Files\Microsoft Visual Studio\2022\Community\VC\Tools\MSVC\你自己的版本\lib\x86
-@echo C:\Program Files\Microsoft Visual Studio\2022\Community\VC\Tools\MSVC\你自己的版本\atlmfc\lib\x64
+rem C:\Program Files\Microsoft Visual Studio\2022\Community\VC\Tools\MSVC\你自己的版本\atlmfc\lib\x64
-@echo C:\Program Files\Microsoft Visual Studio\2022\Community\VC\Tools\MSVC\你自己的版本\atlmfc\lib\x86
+rem C:\Program Files\Microsoft Visual Studio\2022\Community\VC\Tools\MSVC\你自己的版本\atlmfc\lib\x86
 pnpm tauri build -- -Z  build-std --target x86_64-win7-windows-msvc
 rustup default stable
 pnpm tauri build

composables/tray.ts

@@ -89,7 +89,7 @@ export async function MenuItemPublicPeers() {
 		id: "publicPeers",
 		text: "公共节点",
 		action: async () => {
-			await open("https://easytier.gd.nkbpal.cn/status/easytier")
+			await open(import.meta.env.VITE_PUBLIC_PEERS_URL)
 		},
 	});
 }

env/.env.dev

@@ -1,5 +1,7 @@
 VITE_CONFIG_PATH=easytier/config/
+VITE_CONFIG_ADMIN_PATH=easytier/config/.admin/
 VITE_CONFIG_FILE_NAME=easytier/config.json
 VITE_LOG_PATH=easytier/logs/
 VITE_CACHE_PATH=easytier/cache/
+VITE_PUBLIC_PEERS_URL=https://easytier.gd.nkbpal.cn/status/easytier
 VITE_AUTO_START_SERVICE_NAME=easytierGameAutoStart

env/.env.prod

@@ -1,5 +1,7 @@
 VITE_CONFIG_PATH=easytier/config/
+VITE_CONFIG_ADMIN_PATH=easytier/config/.admin/
 VITE_CONFIG_FILE_NAME=easytier/config.json
 VITE_LOG_PATH=easytier/logs/
 VITE_CACHE_PATH=easytier/cache/
+VITE_PUBLIC_PEERS_URL=https://easytier.gd.nkbpal.cn/status/easytier
 VITE_AUTO_START_SERVICE_NAME=easytierGameAutoStart

package.json

@@ -3,7 +3,7 @@
 	"private": true,
 	"author": "leizi97",
 	"description": "A simple network initiator based on Easytier",
-	"version": "1.3.7",
+	"version": "1.3.8",
 	"scripts": {
 		"dev": "nuxt dev --dotenv env/.env.dev --host 0.0.0.0",
 		"build": "nuxt generate --dotenv env/.env.prod",
@@ -16,14 +16,14 @@
 		"@nuxtjs/tailwindcss": "6.13.1",
 		"@pinia/nuxt": "0.9.0",
 		"@tauri-apps/api": "^2.2.0",
-		"@tauri-apps/cli": "2.2.4",
+		"@tauri-apps/cli": "2.2.5",
 		"@tauri-apps/plugin-cli": "^2.2.0",
 		"@tauri-apps/plugin-clipboard-manager": "2.2.0",
+		"@tauri-apps/plugin-dialog": "2.2.0",
 		"@tauri-apps/plugin-fs": "^2.2.0",
 		"@tauri-apps/plugin-log": "^2.2.0",
 		"@tauri-apps/plugin-shell": "^2.2.0",
 		"@tauri-apps/plugin-window-state": "^2.2.0",
-		"@tauri-apps/plugin-dialog": "2.2.0",
 		"@types/lodash-es": "^4.17.12",
 		"@vitejs/plugin-vue-jsx": "^4.1.1",
 		"@vueuse/core": "12.4.0",
@@ -36,7 +36,6 @@
 		"pinia-plugin-persistedstate": "^4.2.0",
 		"postcss": "^8.4.38",
 		"prettier": "3.4.2",
-		"prettier-plugin-tailwindcss": "0.6.10",
+		"prettier-plugin-tailwindcss": "0.6.10"
-		"vue-clipboard3": "^2.0.0"
 	}
 }

pages/index.vue

@@ -85,6 +85,18 @@
 						</ElSelect>
 					</div>
 				</template>
+				<template #footer>
+					<div class="text-center">
+						<ElLink
+							type="primary"
+							size="small"
+							:underline="false"
+							@click.stop="open(publicPeersLink)"
+						>
+							其他公共服务器
+						</ElLink>
+					</div>
+				</template>
 				<ElOption
 					v-for="item in mainStore.basePeers"
 					:key="item"
@@ -133,9 +145,9 @@
 					<template #label>
 						<div class="flex items-center">
 							房间名
-							<ElTooltip content="对应命令行参数 --network-name">
+							<!-- <ElTooltip content="对应命令行参数 --network-name">
 								<ElIcon><QuestionFilled /></ElIcon>
-							</ElTooltip>
+							</ElTooltip> -->
 						</div>
 					</template>
 					<ElInput
@@ -150,9 +162,9 @@
 					<template #label>
 						<div class="flex items-center">
 							房间密码
-							<ElTooltip content="对应命令行参数 --network-secret">
+							<!-- <ElTooltip content="对应命令行参数 --network-secret">
 								<ElIcon><QuestionFilled /></ElIcon>
-							</ElTooltip>
+							</ElTooltip> -->
 						</div>
 					</template>
 					<ElInput
@@ -170,9 +182,9 @@
 				<template #label>
 					<div class="flex items-center">
 						成员名
-						<ElTooltip content="对应命令行参数 --hostname">
+						<!-- <ElTooltip content="对应命令行参数 --hostname">
 							<ElIcon><QuestionFilled /></ElIcon>
-						</ElTooltip>
+						</ElTooltip> -->
 					</div>
 				</template>
 				<ElInput
@@ -203,9 +215,9 @@
 							active-text="动态获取"
 							size="small"
 						></ElSwitch>
-						<ElTooltip content="对应命令行参数 --ipv4">
+						<!-- <ElTooltip content="对应命令行参数 --ipv4">
 							<ElIcon><QuestionFilled /></ElIcon>
-						</ElTooltip>
+						</ElTooltip> -->
 					</div>
 				</template>
 				<ElInput
@@ -215,12 +227,18 @@
 					v-model="config.ipv4"
 				>
 					<template #prefix>
-						<ElTag
+						<ElTooltip
-							size="small"
+							class="!text-[10px]"
-							:type="config.dhcp ? 'info' : 'success'"
+							placement="top-end"
+							:content="config.dhcp ? '动态获取无法手动填写' : '固定IP可以手动填写'"
 						>
-							{{ config.dhcp ? "只读" : "可填" }}
+							<ElTag
-						</ElTag>
+								size="small"
+								:type="config.dhcp ? 'info' : 'success'"
+							>
+								{{ config.dhcp ? "只读" : "可填" }}
+							</ElTag>
+						</ElTooltip>
 					</template>
 				</ElInput>
 			</ElFormItem>
@@ -234,6 +252,7 @@
 					split-button
 					trigger="click"
 					size="default"
+					placement="right-end"
 					:type="!data.isStart ? 'primary' : 'danger'"
 					:disabled="data.startLoading || !data.coreVersion || data.update"
 					@click="handleConnection"
@@ -245,13 +264,13 @@
 								command="import_config"
 								:icon="Link"
 							>
-								导入配置
+								导入联机配置
 							</ElDropdownItem>
 							<ElDropdownItem
 								command="share_config"
 								:icon="Share"
 							>
-								分享联机相关配置
+								分享联机配置
 							</ElDropdownItem>
 							<ElDropdownItem disabled>
 								<ElDivider class="!m-0 !h-[2px]" />
@@ -276,6 +295,21 @@
 							>
 								使用外部配置文件
 							</ElDropdownItem>
+							<ElDropdownItem disabled>
+								<ElDivider class="!m-0 !h-[2px]" />
+							</ElDropdownItem>
+							<ElDropdownItem
+								command="config_admin"
+								:icon="Platform"
+							>
+								配置管理
+							</ElDropdownItem>
+							<ElDropdownItem
+								command="save_config_admin"
+								:icon="CirclePlusFilled"
+							>
+								保存当前配置
+							</ElDropdownItem>
 						</ElDropdownMenu>
 					</template>
 				</ElDropdown>
@@ -511,7 +545,7 @@
 				@click="openConfigDir"
 				size="small"
 			>
-				打开配置目录
+				打开存储目录
 			</ElButton>
 			<ElButton
 				@click="handleStartCommand('toml')"
@@ -549,6 +583,70 @@
 			</div>
 		</template>
 	</ElDialog>
+	<ElDialog
+		width="95%"
+		top="30px"
+		append-to-body
+		:z-index="10"
+		class="!mb-0"
+		v-model="configAdminData.visible"
+		:close-on-press-escape="false"
+		title="配置管理"
+	>
+		<div class="flex items-center gap-[0_4px]">
+			<ElButton
+				@click="openConfigAdminDir"
+				size="small"
+			>
+				打开存储目录
+			</ElButton>
+			<ElButton
+				@click="handleStartCommand('config_admin')"
+				type="primary"
+				:icon="RefreshRight"
+				size="small"
+			>
+				刷新
+			</ElButton>
+		</div>
+		<div class="mt-[5px]">
+			<ElSelect
+				v-model="configAdminData.fileName"
+				no-data-text="目录没有配置文件"
+				placeholder="选择配置文件"
+				filterable
+			>
+				<ElOption
+					v-for="item in configAdminData.list"
+					:key="item.path"
+					:value="item.path"
+					:label="item.name"
+				>
+				</ElOption>
+			</ElSelect>
+		</div>
+		<template #footer>
+			<div class="text-right">
+				<div class="mb-[5px]">
+					<ElAlert show-icon type="warning" title="打开目录删除文件即可删除配置"></ElAlert>
+				</div>
+				<ElButton
+					size="small"
+					@click="handleExchangeAdminConfig"
+					type="primary"
+				>
+					切换选中配置
+				</ElButton>
+				<ElButton
+					size="small"
+					@click="configAdminData.visible = false"
+					type="danger"
+				>
+					关闭
+				</ElButton>
+			</div>
+		</template>
+	</ElDialog>
 </template>
 <script setup lang="ts">
 	import { invoke } from "@tauri-apps/api/core";
@@ -558,7 +656,7 @@
 		QuestionFilled,
 		Delete,
 		List,
-		UserFilled,
+		CirclePlusFilled,
 		Setting,
 		Share,
 		RefreshRight,
@@ -567,7 +665,8 @@
 		MagicStick,
 		SetUp,
 		Folder,
-		CopyDocument
+		CopyDocument,
+		Platform
 	} from "@element-plus/icons-vue";
 	import { reactive, onBeforeUnmount, onMounted, ref, toRaw } from "vue";
 	import { useTray, setTrayRunState, setTrayTooltip, checkNewVersion } from "~/composables/tray";
@@ -579,16 +678,16 @@
 	import { getAllWebviewWindows, WebviewWindow } from "@tauri-apps/api/webviewWindow";
 	import etWindows from "@/composables/windows";
 	import { resourceDir as getResourceDir, join } from "@tauri-apps/api/path";
-	import { readDir, exists, mkdir, BaseDirectory, readTextFile, readFile } from "@tauri-apps/plugin-fs";
+	import { readDir, exists, mkdir, BaseDirectory, readTextFile, readFile, writeFile } from "@tauri-apps/plugin-fs";
 	import { updateConfigJson } from "~/composables/configJson";
 	import { writeText, readText } from "@tauri-apps/plugin-clipboard-manager";
 	import { sortedUniq, uniq } from "lodash-es";
-	import { bounce, addQQGroup, supportProtocols, preventSleep, stopPreventSleep, ATJ, copyText } from "~/utils";
+	import { bounce, addQQGroup, supportProtocols, preventSleep, stopPreventSleep, ATJ, copyText, isValidWindowsFileName } from "~/utils";
 	import { ElConfirmDanger, ElConfirmPrimary } from "~/utils/element";
 	import { getServerArgs } from "@/composables/server";
 
 	let is_close = false;
-
+	const publicPeersLink = import.meta.env.VITE_PUBLIC_PEERS_URL;
 	const tray = await useTray(
 		true,
 		async () => {
@@ -636,6 +735,13 @@
 		list: [] //配置文件列表
 	});
 
+	const configAdminData = reactive<{ fileName: string; list: Array<{ path: string; name: string }>; [key: string]: any }>({
+		visible: false,
+		loading: false,
+		list: [],
+		fileName: ""
+	});
+
 	const importConfigData = reactive<{ data: ""; [key: string]: any }>({
 		visible: false,
 		loading: false,
@@ -1269,21 +1375,26 @@
 			configStart.visible = true;
 			const path = import.meta.env.VITE_CONFIG_PATH;
 			const isExists = await exists(path, { baseDir: BaseDirectory.Resource });
-			if (isExists) {
+			if (!isExists) {
-				const entries = await readDir(path, { baseDir: BaseDirectory.Resource });
-				configStart.list = entries
-					.filter(item => item.isFile)
-					.map(item => ({
-						name: item.name,
-						path: `${path}${item.name}`
-					})) as any;
-			} else {
 				mainStore.configStartEnable = false;
 				mainStore.configPath = "";
 				try {
-					await mkdir(path, { baseDir: BaseDirectory.Resource });
+					await mkdir(path, { baseDir: BaseDirectory.Resource, recursive: true });
-				} catch (err) {}
+				} catch (err) {
+					console.error(err);
+					return;
+				}
 			}
+			const entries = await readDir(path, { baseDir: BaseDirectory.Resource });
+			configStart.list = entries
+				.filter(item => {
+					const nameLower = item.name.toLowerCase();
+					return item.isFile && (nameLower.endsWith(".toml") || nameLower.endsWith(".yaml"));
+				})
+				.map(item => ({
+					name: item.name,
+					path: `${path}${item.name}`
+				})) as any;
 		}
 		if (command === "share_config") {
 			try {
@@ -1372,6 +1483,97 @@
 		if (command === "create_server") {
 			await handleShowServerDialog();
 		}
+		if (command === "config_admin") {
+			configAdminData.visible = true;
+			const path = import.meta.env.VITE_CONFIG_ADMIN_PATH;
+			const isExists = await exists(path, { baseDir: BaseDirectory.Resource });
+			if (!isExists) {
+				try {
+					await mkdir(path, { baseDir: BaseDirectory.Resource, recursive: true });
+				} catch (err) {
+					console.error(err);
+					return;
+				}
+			}
+			const entries = await readDir(path, { baseDir: BaseDirectory.Resource });
+			configAdminData.list = entries
+				.filter(item => item.isFile)
+				.map(item => ({
+					name: item.name,
+					path: `${path}${item.name}`
+				})) as any;
+		}
+		if (command === "save_config_admin") {
+			const config = btoa(encodeURIComponent(JSON.stringify(mainStore.$state)));
+			const [error, { value = "" } = {}] = await ATJ(
+				ElMessageBox.prompt("请输入配置的存储名", "提示", {
+					confirmButtonText: "保存",
+					cancelButtonText: "取消",
+					inputPlaceholder: "请输入2个字以上的存储名",
+					inputValidator: (value: string) => {
+						const result = isValidWindowsFileName(value);
+						if (result) {
+							return true;
+						}
+						return "文件名不合法";
+					}
+				})
+			);
+			if (!error) {
+				const dir = import.meta.env.VITE_CONFIG_ADMIN_PATH;
+				const filePath = `${dir}${value}`;
+				const isExistsDir = await exists(dir, { baseDir: BaseDirectory.Resource });
+				if (!isExistsDir) {
+					try {
+						await mkdir(dir, { baseDir: BaseDirectory.Resource, recursive: true });
+					} catch (err) {
+						console.error(err);
+						return;
+					}
+				}
+				const isExists = await exists(filePath, { baseDir: BaseDirectory.Resource });
+				let allowWrite = true;
+				if (isExists) {
+					const [err] = await ElConfirmPrimary("配置名已存在，是否覆盖?", "提示", {
+						confirmButtonText: "确定",
+						cancelButtonText: "取消"
+					});
+					if (err) {
+						allowWrite = false;
+					}
+				}
+				if (allowWrite) {
+					let encoder = new TextEncoder();
+					let data = encoder.encode(config);
+					// console.log(filePath, data);
+					await writeFile(filePath, data, { baseDir: BaseDirectory.Resource });
+					ElMessage.success("保存成功");
+				}
+			}
+		}
+	};
+
+	const handleExchangeAdminConfig = async () => {
+		const path = configAdminData.fileName;
+		if (!path) return ElMessage.warning("请选择配置");
+		// import.meta.env.VITE_CONFIG_ADMIN_PATH
+		const [err] = await ElConfirmPrimary("会覆盖当前配置,确定切换吗?");
+		if (err) return;
+		const base64U8Arrray = await readFile(path, { baseDir: BaseDirectory.Resource });
+		const decoder = new TextDecoder("utf-8");
+		try {
+			if (data.isStart) {
+				ElMessage.warning("停止联机..");
+				await reset();
+			}
+			const json: typeof mainStore.$state = JSON.parse(decodeURIComponent(atob(decoder.decode(base64U8Arrray))));
+			mainStore.$patch(json);
+			ElMessage.success("切换成功");
+			configAdminData.visible = false;
+		} catch (err) {
+			ElMessage.error("读取配置失败");
+			console.log(err);
+		}
 	};
 
 	const handleStartImport = async () => {
@@ -1419,6 +1621,12 @@
 		// console.error(configPath);
 		await Command.create("explorer", [configPath]).execute();
 	};
+	const openConfigAdminDir = async () => {
+		const resourceDir = await getResourceDir();
+		const configPath = await join(resourceDir, import.meta.env.VITE_CONFIG_ADMIN_PATH);
+		// console.error(configPath);
+		await Command.create("explorer", [configPath]).execute();
+	};
 
 	const handleShowMemberDialog = async () => {
 		if (!data.isStart) {

pnpm-lock.yaml

@@ -24,8 +24,8 @@ importers:
         specifier: ^2.2.0
         version: 2.2.0
       '@tauri-apps/cli':
-        specifier: 2.2.4
+        specifier: 2.2.5
-        version: 2.2.4
+        version: 2.2.5
       '@tauri-apps/plugin-cli':
         specifier: ^2.2.0
         version: 2.2.0
@@ -86,9 +86,6 @@ importers:
       prettier-plugin-tailwindcss:
         specifier: 0.6.10
         version: 0.6.10(prettier@3.4.2)
-      vue-clipboard3:
-        specifier: ^2.0.0
-        version: 2.0.0
 
 packages:
 
@@ -1024,72 +1021,72 @@ packages:
   '@tauri-apps/api@2.2.0':
     resolution: {integrity: sha512-R8epOeZl1eJEl603aUMIGb4RXlhPjpgxbGVEaqY+0G5JG9vzV/clNlzTeqc+NLYXVqXcn8mb4c5b9pJIUDEyAg==}
 
-  '@tauri-apps/cli-darwin-arm64@2.2.4':
+  '@tauri-apps/cli-darwin-arm64@2.2.5':
-    resolution: {integrity: sha512-+sMLkQBFebn/UENyaXpyQqRkdFQie8RdEvYVz0AGthm2p0lMVlWiBmc4ImBJmfo8569zVeDX8B+5OWt4/AuZzA==}
+    resolution: {integrity: sha512-qdPmypQE7qj62UJy3Wl/ccCJZwsv5gyBByOrAaG7u5c/PB3QSxhNPegice2k4EHeIuApaVJOoe/CEYVgm/og2Q==}
     engines: {node: '>= 10'}
     cpu: [arm64]
     os: [darwin]
 
-  '@tauri-apps/cli-darwin-x64@2.2.4':
+  '@tauri-apps/cli-darwin-x64@2.2.5':
-    resolution: {integrity: sha512-6fJvXVtQJh7H8q9sll2XC2wO5bpn7bzeh+MQxpcLq6F8SE02sFuNDLN+AqX0DQnuYV0V6jdzM2+bTYOlc1FBsw==}
+    resolution: {integrity: sha512-8JVlCAb2c3n0EcGW7n/1kU4Rq831SsoLDD/0hNp85Um8HGIH2Mg/qos/MLOc8Qv2mOaoKcRKf4hd0I1y0Rl9Cg==}
     engines: {node: '>= 10'}
     cpu: [x64]
     os: [darwin]
 
-  '@tauri-apps/cli-linux-arm-gnueabihf@2.2.4':
+  '@tauri-apps/cli-linux-arm-gnueabihf@2.2.5':
-    resolution: {integrity: sha512-QU6Ac6tx79iqkxsDUQesCBNq8RrVSkP9HhVzS2reKthK3xbdTCwNUXoRlfhudKMVrIxV4K7uTwUV99eAnwbm5Q==}
+    resolution: {integrity: sha512-mzxQCqZg7ljRVgekPpXQ5TOehCNgnXh/DNWU6kFjALaBvaw4fGzc369/hV94wOt29htNFyxf8ty2DaQaYljEHw==}
     engines: {node: '>= 10'}
     cpu: [arm]
     os: [linux]
 
-  '@tauri-apps/cli-linux-arm64-gnu@2.2.4':
+  '@tauri-apps/cli-linux-arm64-gnu@2.2.5':
-    resolution: {integrity: sha512-uZhp312s6VgJJDgUg+HuHZnhjGg93OT+q/aZMoccdZVQ6dvwH8kJzIkKt9zL1U126AXXoesb1EyYmsAruxaUKA==}
+    resolution: {integrity: sha512-M9nkzx5jsSJSNpp7aSza0qv0/N13SUNzH8ysYSZ7IaCN8coGeMg2KgQ5qC6tqUVij2rbg8A/X1n0pPo/gtLx0A==}
     engines: {node: '>= 10'}
     cpu: [arm64]
     os: [linux]
     libc: [glibc]
 
-  '@tauri-apps/cli-linux-arm64-musl@2.2.4':
+  '@tauri-apps/cli-linux-arm64-musl@2.2.5':
-    resolution: {integrity: sha512-k6JCXd9E+XU0J48nVcFr3QO//bzKg/gp8ZKagBfI2wBpHOk14CnHNBQKNs11nMQUwko4bnPeqj4llcdkbmwIbw==}
+    resolution: {integrity: sha512-tFhZu950HNRLR1RM5Q9Xj5gAlA6AhyyiZgeoXGFAWto+s2jpWmmA3Qq2GUxnVDr7Xui8PF4UY5kANDIOschuwg==}
     engines: {node: '>= 10'}
     cpu: [arm64]
     os: [linux]
     libc: [musl]
 
-  '@tauri-apps/cli-linux-x64-gnu@2.2.4':
+  '@tauri-apps/cli-linux-x64-gnu@2.2.5':
-    resolution: {integrity: sha512-bUBPU46OF1pNfM6SsGbUlkCBh/pTzvFlEdUpDISsS40v9NVt+kqCy3tHzLGB412E3lSlA6FnshB6HxkdRRdTtg==}
+    resolution: {integrity: sha512-eaGhTQLr3EKeksGsp2tK/Ndi7/oyo3P53Pye6kg0zqXiqu8LQjg1CgvDm1l+5oit04S60zR4AqlDFpoeEtDGgw==}
     engines: {node: '>= 10'}
     cpu: [x64]
     os: [linux]
     libc: [glibc]
 
-  '@tauri-apps/cli-linux-x64-musl@2.2.4':
+  '@tauri-apps/cli-linux-x64-musl@2.2.5':
-    resolution: {integrity: sha512-vOrpsQDiMtP8q/ZeXfXqgNi3G4Yv5LVX2vI5XkB2yvVuVF1Dvky/hcCJfi9tZQD+IpeiYxjuj7+SxHp82eQ/kA==}
+    resolution: {integrity: sha512-NLAO/SymDxeGuOWWQZCpwoED1K1jaHUvW+u9ip+rTetnxFPLvf3zXthx4QVKfCZLdj2WLQz4cLjHyQdMDXAM+w==}
     engines: {node: '>= 10'}
     cpu: [x64]
     os: [linux]
     libc: [musl]
 
-  '@tauri-apps/cli-win32-arm64-msvc@2.2.4':
+  '@tauri-apps/cli-win32-arm64-msvc@2.2.5':
-    resolution: {integrity: sha512-iEP/Cq0ts4Ln4Zh2NSC01lkYEAhr+LotbG4U2z+gxHfCdMrtYYtYdG05C2mpeIxShzL7uEIQb/lhVRBMd7robg==}
+    resolution: {integrity: sha512-yG5KFbqrHfGjkAQAaaCD4i7cJklBjmMxZ2C92DEnqCOujSsEuLxrwwoKxQ4+hqEHOmF3lyX0vfqhgZcS03H38w==}
     engines: {node: '>= 10'}
     cpu: [arm64]
     os: [win32]
 
-  '@tauri-apps/cli-win32-ia32-msvc@2.2.4':
+  '@tauri-apps/cli-win32-ia32-msvc@2.2.5':
-    resolution: {integrity: sha512-YBbqF0wyHUT00zAGZTTbEbz/C5JDGPnT1Nodor96+tzEU6qAPRYfe5eFe/rpRARbalkpw1UkcVP0Ay8gnksAiA==}
+    resolution: {integrity: sha512-G5lq+2EdxOc8ttg3uhME5t9U3hMGTxwaKz0X4DplTG2Iv4lcNWqw/AESIJVHa5a+EB+ZCC8I+yOfIykp/Cd5mQ==}
     engines: {node: '>= 10'}
     cpu: [ia32]
     os: [win32]
 
-  '@tauri-apps/cli-win32-x64-msvc@2.2.4':
+  '@tauri-apps/cli-win32-x64-msvc@2.2.5':
-    resolution: {integrity: sha512-MMago/SfWZbUFrwFmPCXmmbb42h7u8Y5jvLvnK2mOpOfCAsei2tLO4hx+Inoai0l2DByuYO4Ef1xDyP6shCsZQ==}
+    resolution: {integrity: sha512-vw4fPVOo0rIQIlqw6xUvK2nwiRFBHNgayDE2Z/SomJlQJAJ1q4VgpHOPl12ouuicmTjK1gWKm7RTouQe3Nig0Q==}
     engines: {node: '>= 10'}
     cpu: [x64]
     os: [win32]
 
-  '@tauri-apps/cli@2.2.4':
+  '@tauri-apps/cli@2.2.5':
-    resolution: {integrity: sha512-pihbuHEWJa9SEcN7JdEbMa0oq28MTTbk0nNNnRG8/irNQTKcjwM+KzxG2wuYZYbsXQVqwSu7PstdIEAnXqYHkw==}
+    resolution: {integrity: sha512-PaefTQUCYYqvZWdH8EhXQkyJEjQwtoy/OHGoPcZx7Gk3D3K6AtGSxZ9OlHIz3Bu5LDGgVBk36vKtHW0WYsWnbw==}
     engines: {node: '>= 10'}
     hasBin: true
 
@@ -1482,9 +1479,6 @@ packages:
   citty@0.1.6:
     resolution: {integrity: sha512-tskPPKEs8D2KPafUypv2gxwJP8h/OaJmC82QQGGDQcHvXX43xF2VDACcJVmZ0EuSxkpO9Kc4MlrA3q0+FG58AQ==}
 
-  clipboard@2.0.11:
-    resolution: {integrity: sha512-C+0bbOqkezLIsmWSvlsXS0Q0bmkugu7jcfMIACB+RDEntIzQIkdr148we28AfSloQLRdZlYL/QYyrq05j/3Faw==}
-
   clipboardy@4.0.0:
     resolution: {integrity: sha512-5mOlNS0mhX0707P2I0aZ2V/cmHUEO/fL7VFLqszkhUsxt7RwnmrInf/eEQKlf5GzvYeHIjT+Ov1HRfNmymlG0w==}
     engines: {node: '>=18'}
@@ -1748,9 +1742,6 @@ packages:
   defu@6.1.4:
     resolution: {integrity: sha512-mEQCMmwJu317oSz8CwdIOdwf3xMif1ttiM8LTufzc3g6kR+9Pe236twL8j3IYT1F7GfRgGcW6MWxzZjLIkuHIg==}
 
-  delegate@3.2.0:
-    resolution: {integrity: sha512-IofjkYBZaZivn0V8nnsMJGBr4jVLxHDheKSW88PyxS5QC4Vo9ZbZVvhzlSxY87fVq3STR6r+4cGepyHkcWOQSw==}
-
   delegates@1.0.0:
     resolution: {integrity: sha512-bd2L678uiWATM6m5Z1VzNCErI3jiGzt6HGY8OVICs40JQq/HALfbyNJmp0UDakEY4pMMaN0Ly5om/B1VI/+xfQ==}
 
@@ -2060,9 +2051,6 @@ packages:
     resolution: {integrity: sha512-s3Fq41ZVh7vbbe2PN3nrW7yC7U7MFVc5c98/iTl9c2GawNMKx/J648KQRW6WKkuU8GIbbh2IXfIRQjOZnXcTnw==}
     engines: {node: '>=18'}
 
-  good-listener@1.2.2:
-    resolution: {integrity: sha512-goW1b+d9q/HIwbVYZzZ6SsTr4IgE+WA44A0GmPIQstuOrgsFcT7VEJ48nmr9GaRtNu0XTKacFLGnBPAM6Afouw==}
-
   graceful-fs@4.2.11:
     resolution: {integrity: sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==}
 
@@ -3312,9 +3300,6 @@ packages:
   scule@1.3.0:
     resolution: {integrity: sha512-6FtHJEvt+pVMIB9IBY+IcCJ6Z5f1iQnytgyfKMhDKgmzYG+TeH/wx1y3l27rshSbLiSanrR9ffZDrEsmjlQF2g==}
 
-  select@1.1.2:
-    resolution: {integrity: sha512-OwpTSOfy6xSs1+pwcNrv0RBMOzI39Lp3qQKUTPVVPRjCdNa5JH/oPRiqsesIskK8TVgmRiHwO4KXlV2Li9dANA==}
-
   semver@5.7.2:
     resolution: {integrity: sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==}
     hasBin: true
@@ -3534,9 +3519,6 @@ packages:
   thenify@3.3.1:
     resolution: {integrity: sha512-RVZSIV5IG10Hk3enotrhvz0T9em6cyHBLkH/YAZuKqd8hRkKhSfCGIcP2KUY0EPxndzANBmNllzWPwak+bheSw==}
 
-  tiny-emitter@2.1.0:
-    resolution: {integrity: sha512-NB6Dk1A9xgQPMoGqC5CVXn123gWyte215ONT5Pp5a0yt4nlEoO1ZWeCwpncaekPHXO60i47ihFnZPiRPjRMq4Q==}
-
   tiny-invariant@1.3.3:
     resolution: {integrity: sha512-+FbBPE1o9QAYvviau/qC5SE3caw21q3xkvWKBtja5vgqOWIHHJ3ioaq1VPfn/Szqctz2bU/oYeKd9/z5BL+PVg==}
 
@@ -3907,9 +3889,6 @@ packages:
   vue-bundle-renderer@2.1.1:
     resolution: {integrity: sha512-+qALLI5cQncuetYOXp4yScwYvqh8c6SMXee3B+M7oTZxOgtESP0l4j/fXdEJoZ+EdMxkGWIj+aSEyjXkOdmd7g==}
 
-  vue-clipboard3@2.0.0:
-    resolution: {integrity: sha512-Q9S7dzWGax7LN5iiSPcu/K1GGm2gcBBlYwmMsUc5/16N6w90cbKow3FnPmPs95sungns4yvd9/+JhbAznECS2A==}
-
   vue-demi@0.14.10:
     resolution: {integrity: sha512-nMZBOwuzabUO0nLgIcc6rycZEebF6eeUfaiQx9+WSk8e29IbLvPU9feI6tqW4kTo3hvoYAJkMh8n8D0fuISphg==}
     engines: {node: '>=12'}
@@ -5108,48 +5087,48 @@ snapshots:
 
   '@tauri-apps/api@2.2.0': {}
 
-  '@tauri-apps/cli-darwin-arm64@2.2.4':
+  '@tauri-apps/cli-darwin-arm64@2.2.5':
     optional: true
 
-  '@tauri-apps/cli-darwin-x64@2.2.4':
+  '@tauri-apps/cli-darwin-x64@2.2.5':
     optional: true
 
-  '@tauri-apps/cli-linux-arm-gnueabihf@2.2.4':
+  '@tauri-apps/cli-linux-arm-gnueabihf@2.2.5':
     optional: true
 
-  '@tauri-apps/cli-linux-arm64-gnu@2.2.4':
+  '@tauri-apps/cli-linux-arm64-gnu@2.2.5':
     optional: true
 
-  '@tauri-apps/cli-linux-arm64-musl@2.2.4':
+  '@tauri-apps/cli-linux-arm64-musl@2.2.5':
     optional: true
 
-  '@tauri-apps/cli-linux-x64-gnu@2.2.4':
+  '@tauri-apps/cli-linux-x64-gnu@2.2.5':
     optional: true
 
-  '@tauri-apps/cli-linux-x64-musl@2.2.4':
+  '@tauri-apps/cli-linux-x64-musl@2.2.5':
     optional: true
 
-  '@tauri-apps/cli-win32-arm64-msvc@2.2.4':
+  '@tauri-apps/cli-win32-arm64-msvc@2.2.5':
     optional: true
 
-  '@tauri-apps/cli-win32-ia32-msvc@2.2.4':
+  '@tauri-apps/cli-win32-ia32-msvc@2.2.5':
     optional: true
 
-  '@tauri-apps/cli-win32-x64-msvc@2.2.4':
+  '@tauri-apps/cli-win32-x64-msvc@2.2.5':
     optional: true
 
-  '@tauri-apps/cli@2.2.4':
+  '@tauri-apps/cli@2.2.5':
     optionalDependencies:
-      '@tauri-apps/cli-darwin-arm64': 2.2.4
+      '@tauri-apps/cli-darwin-arm64': 2.2.5
-      '@tauri-apps/cli-darwin-x64': 2.2.4
+      '@tauri-apps/cli-darwin-x64': 2.2.5
-      '@tauri-apps/cli-linux-arm-gnueabihf': 2.2.4
+      '@tauri-apps/cli-linux-arm-gnueabihf': 2.2.5
-      '@tauri-apps/cli-linux-arm64-gnu': 2.2.4
+      '@tauri-apps/cli-linux-arm64-gnu': 2.2.5
-      '@tauri-apps/cli-linux-arm64-musl': 2.2.4
+      '@tauri-apps/cli-linux-arm64-musl': 2.2.5
-      '@tauri-apps/cli-linux-x64-gnu': 2.2.4
+      '@tauri-apps/cli-linux-x64-gnu': 2.2.5
-      '@tauri-apps/cli-linux-x64-musl': 2.2.4
+      '@tauri-apps/cli-linux-x64-musl': 2.2.5
-      '@tauri-apps/cli-win32-arm64-msvc': 2.2.4
+      '@tauri-apps/cli-win32-arm64-msvc': 2.2.5
-      '@tauri-apps/cli-win32-ia32-msvc': 2.2.4
+      '@tauri-apps/cli-win32-ia32-msvc': 2.2.5
-      '@tauri-apps/cli-win32-x64-msvc': 2.2.4
+      '@tauri-apps/cli-win32-x64-msvc': 2.2.5
 
   '@tauri-apps/plugin-cli@2.2.0':
     dependencies:
@@ -5668,12 +5647,6 @@ snapshots:
     dependencies:
       consola: 3.3.3
 
-  clipboard@2.0.11:
-    dependencies:
-      good-listener: 1.2.2
-      select: 1.1.2
-      tiny-emitter: 2.1.0
-
   clipboardy@4.0.0:
     dependencies:
       execa: 8.0.1
@@ -5895,8 +5868,6 @@ snapshots:
 
   defu@6.1.4: {}
 
-  delegate@3.2.0: {}
-
   delegates@1.0.0: {}
 
   denque@2.1.0: {}
@@ -6261,10 +6232,6 @@ snapshots:
       slash: 5.1.0
       unicorn-magic: 0.1.0
 
-  good-listener@1.2.2:
-    dependencies:
-      delegate: 3.2.0
-
   graceful-fs@4.2.11: {}
 
   gzip-size@7.0.0:
@@ -7634,8 +7601,6 @@ snapshots:
 
   scule@1.3.0: {}
 
-  select@1.1.2: {}
-
   semver@5.7.2:
     optional: true
 
@@ -7904,8 +7869,6 @@ snapshots:
     dependencies:
       any-promise: 1.3.0
 
-  tiny-emitter@2.1.0: {}
-
   tiny-invariant@1.3.3: {}
 
   tinyexec@0.3.2: {}
@@ -8277,10 +8240,6 @@ snapshots:
     dependencies:
       ufo: 1.5.4
 
-  vue-clipboard3@2.0.0:
-    dependencies:
-      clipboard: 2.0.11
-
   vue-demi@0.14.10(vue@3.5.13(typescript@5.6.3)):
     dependencies:
       vue: 3.5.13(typescript@5.6.3)

src-tauri/Cargo.lock

@@ -1269,7 +1269,7 @@ checksum = "0d6ef0072f8a535281e4876be788938b528e9a1d43900b82c2569af7da799125"
 
 [[package]]
 name = "easytier-game"
-version = "1.3.7"
+version = "1.3.8"
 dependencies = [
  "hashbrown 0.15.2",
  "log",
@@ -4148,9 +4148,9 @@ dependencies = [
 
 [[package]]
 name = "serde_json"
-version = "1.0.135"
+version = "1.0.137"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2b0d7ba2887406110130a978386c4e1befb98c674b4fba677954e4db976630d9"
+checksum = "930cfb6e6abf99298aaad7d29abbef7a9999a9a8806a40088f55f0dcec03146b"
 dependencies = [
  "itoa 1.0.14",
  "memchr",
@@ -4628,9 +4628,9 @@ checksum = "61c41af27dd6d1e27b1b16b489db798443478cef1f06a660c96db617ba5de3b1"
 
 [[package]]
 name = "tauri"
-version = "2.2.2"
+version = "2.2.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2979ec5ec5a9310b15d1548db3b8de98d8f75abf2b5b00fec9cd5c0553ecc09c"
+checksum = "78f6efc261c7905839b4914889a5b25df07f0ff89c63fb4afd6ff8c96af15e4d"
 dependencies = [
  "anyhow",
  "bytes",
@@ -4888,9 +4888,9 @@ dependencies = [
 
 [[package]]
 name = "tauri-plugin-window-state"
-version = "2.2.0"
+version = "2.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "234dd891cc7960fa28f93ea911f3e0d9ce8375ebf9ff303831bdd7a3443d5714"
+checksum = "35e344b512b0d99d9d06225f235d87d6c66d89496a3bf323d9b578d940596e6c"
 dependencies = [
  "bitflags 2.7.0",
  "log",

src-tauri/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "easytier-game"
-version = "1.3.7"
+version = "1.3.8"
 homepage = "https://github.com/EasyTier/EasyTier"
 repository = "https://github.com/EasyTier/EasytierGame"
 description = "A simple network initiator based on Easytier"
@@ -22,10 +22,10 @@ tauri-build = { version = "2.0.5", features = [] }
 # prost-build = "0.13.2"
 
 [dependencies]
-serde_json = "1.0.135"
+serde_json = "1.0.137"
 serde = { version = "1.0.217", features = ["derive"] }
 log = "0.4.25"
-tauri = { version = "2.2.2", features = [
+tauri = { version = "2.2.3", features = [
     "tray-icon",
     "image-png",
     "image-ico",
@@ -55,4 +55,4 @@ features = ["Win32_System_TaskScheduler", "Win32_System_Power", "Win32_NetworkMa
 [target."cfg(not(any(target_os = \"android\", target_os = \"ios\")))".dependencies]
 tauri-plugin-cli = "2.2.0"
 tauri-plugin-single-instance = "2.2.1"
-tauri-plugin-window-state = "2.2.0"
+tauri-plugin-window-state = "2.2.1"

src-tauri/tauri.conf.json

@@ -1,7 +1,7 @@
 {
 	"$schema": "../node_modules/@tauri-apps/cli/config.schema.json",
 	"productName": "easytier-game",
-	"version": "1.3.7",
+	"version": "1.3.8",
 	"identifier": "com.tauri.easytier-game",
 
 	"build": {
@@ -13,7 +13,7 @@
 	"app": {
 		"windows": [
 			{
-				"title": "easytier-game 1.3.7",
+				"title": "easytier-game 1.3.8",
 				"label": "main",
 				"minWidth": 340,
 				"width": 340,

utils/element.ts

@@ -4,7 +4,7 @@ import { h, type VNode } from "vue";
 type Opt = { action?: string; confirmButtonText?: string; cancelButtonText?: string; VNode?: VNode | null, showCancelButton?:boolean }
 export const ElConfirmDanger = (
 	content: string,
-	title: string,
+	title: string = "提示",
 	opt: Opt = {
 		action: "",
 		confirmButtonText: "确定",
@@ -40,7 +40,7 @@ export const ElConfirmDanger = (
 
 export const ElConfirmSucces = (
 	content: string,
-	title: string,
+	title: string = "提示",
 	opt: Opt = {
 		action: "",
 		confirmButtonText: "确定",
@@ -76,7 +76,7 @@ export const ElConfirmSucces = (
 
 export const ElConfirmPrimary = (
 	content: string,
-	title: string,
+	title: string = "提示",
 	opt: Opt = {
 		action: "",
 		confirmButtonText: "确定",

utils/index.ts

@@ -126,6 +126,20 @@ export const parseCliInfo = (content: string) => {
 	return result;
 };
 
+export function isValidWindowsFileName(name: string) {
+	if(name.length > 255) return false;
+	const reserved_names = [
+        "CON", "PRN", "AUX", "NUL",
+        "COM1", "COM2", "COM3", "COM4", "COM5", "COM6", "COM7", "COM8", "COM9",
+        "LPT1", "LPT2", "LPT3", "LPT4", "LPT5", "LPT6", "LPT7", "LPT8", "LPT9"
+	];
+	if(reserved_names.includes(name.toUpperCase())) {
+		return false;
+	}
+	return /^[^<>:"/\\|?*\x00-\x1F]+[^<>:"/\\|?*\x00-\x1F .]$/g.test(name);
+	
+}
+
 export const addQQGroup = () => {
 	open("https://qm.qq.com/q/Yo3HmaEIWC");
 };