重大结构更新

+ 升级rust为1.8版本
+ 升级tauri为最新版，以及其他包升级
+ 现在构建分为window7和window7以上两种版本
+ 优化分享配置弹窗遮盖问题
+ 增加uninstall.exe（不会删除日志）
+ 增加windows.0.48.5.lib
+ 增加build.bat 内含windows7构建之前的操作

.gitignore

@@ -11,6 +11,4 @@ dist
 .vscode
 release
 
-src-tauri/easytier/logs
-src-tauri/easytier/tool/ResourcesExtract.exe
-src-tauri/easytier/tool/ResourcesExtract.cfg
+src-tauri/easytier/logs

.nvmdrc

@@ -1 +1 @@
-20.18.3
+20.18.1

assets/css/main.css

@@ -10,7 +10,7 @@
 	}
 } */
 html {
-	font-family: "Helvetica Neue", Helvetica, "PingFang SC", "Hiragino Sans GB", "Microsoft YaHei", "微软雅黑", Arial, sans-serif;
+	font-family: "Helvetica Neue",Helvetica,"PingFang SC","Hiragino Sans GB","Microsoft YaHei","微软雅黑",Arial,sans-serif;
 }
 html,
 body {
@@ -51,24 +51,9 @@ html.dark body {
 }
 
 .el-table {
-	font-size: 12px !important;
+	font-size: 12px!important;
 }
 
 .el-select-dropdown__wrap {
-	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;
-}
-
-.el-message-box__content + .el-message-box__btns {
-	display: flex;
-	flex-wrap: wrap;
-	justify-content: flex-start;
-	flex-direction: row-reverse;
-	gap: 0 10px;
-}
+	max-height: 150px!important;
+}

build.bat

@@ -1,10 +1,9 @@
-pnpm run build
 rustup default nightly
-rem 使用rust nightly构建支持win7的版本，请先将根目录的windows.0.48.5 放入以下目录
-rem 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\x86
-rem 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\x86
+@echo 使用rust nightly构建支持win7的版本，请先将根目录的windows.0.48.5 放入以下目录
+@echo 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
+@echo 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
 pnpm tauri build -- -Z  build-std --target x86_64-win7-windows-msvc
 rustup default stable
 pnpm tauri build

composables/configJson.ts

@@ -14,15 +14,23 @@ export const updateConfigJson = async (configJsonSeverUrl: Array<string> | strin
 		const {
 			proxyNetworks,
 			autoStart,
+			relayAllPeerrpc,
 			connectAfterStart,
+			multiThread,
+			enablExitNode,
+			useSmoltcp,
 			saveErrorLog,
+			logLevel,
 			serverUrl,
+			port,
 			enableCustomListener,
+			enablePreventSleep,
 			customListenerData,
+			customListenerV6Data,
+			enableCustomListenerV6,
 			...otherConfig
 		} = mainStore.config;
 		let writeServerUrl: Array<string> | string = serverUrl;
-		let writeCustomListenerData: Array<string> = (customListenerData || "").split("\n");
 		if (isArray) {
 			writeServerUrl = intersection(
 				uniq([serverUrl, ...configJsonSeverUrl]).filter(boolean => boolean),
@@ -35,11 +43,7 @@ export const updateConfigJson = async (configJsonSeverUrl: Array<string> | strin
 				mainStore.basePeers
 			).join(",");
 		}
-		await writeTextFile(
-			path,
-			JSON.stringify({ serverUrl: writeServerUrl, enableCustomListener, customListenerData: writeCustomListenerData, ...otherConfig }, null, 4),
-			{ baseDir: BaseDirectory.Resource }
-		);
+		await writeTextFile(path, JSON.stringify({ serverUrl: writeServerUrl, ...otherConfig }, null, 4), { baseDir: BaseDirectory.Resource });
 	} catch (err) {
 		console.error(err);
 		ElMessage.error(`更新config.json失败`);

composables/icon.ts

@@ -1,33 +0,0 @@
-import { basename, extname } from "@tauri-apps/api/path";
-import { exists } from "@tauri-apps/plugin-fs";
-import { Command } from "@tauri-apps/plugin-shell";
-
-export const getIcon = async function (sourcePath: string, icoDirPath: string) {
-	if(sourcePath.endsWith(".url")) return false;
-	let res = await Command.create("ResourcesExtract", [
-		"/Source",
-		sourcePath,
-		"/DestFolder",
-		icoDirPath,
-		"/ExtractIcons",
-		"1",
-		"/ExtractCursors",
-		"0",
-		"/OpenDestFolder",
-		"0",
-		"/MultiFilesMode",
-		"1"
-	]).execute();
-	if (res.code == 0) {
-		let icoPath = icoDirPath + "\\" + (await basename(sourcePath));
-		icoPath = icoPath.replace(`.${await extname(sourcePath)}`, "_1.ico");
-		if (await exists(icoPath)) {
-			return icoPath;
-		} else {
-			return false;
-		}
-		return;
-	} else {
-		return false;
-	}
-};

composables/tray.ts

@@ -8,7 +8,6 @@ import { resourceDir as getResourceDir, join } from "@tauri-apps/api/path";
 import { invoke } from "@tauri-apps/api/core";
 // import { ElConfirmPrimary } from "~/utils/element";
 import { open } from "@tauri-apps/plugin-shell";
-import { computed } from "vue";
 
 const DEFAULT_TRAY_NAME = "main";
 
@@ -31,10 +30,13 @@ export async function useTray(init: boolean = false, beforExit: Function, handle
 				tooltip: `EasyTierGame\n${pkg.version}`,
 				title: `EasyTierGame\n${pkg.version}`,
 				id: DEFAULT_TRAY_NAME,
-				menu: await Menu.new({ id: "main", items: await generateMenuItem(beforExit, handleConnection) }),
-				action: async e => {
+				menu: await Menu.new({
+					id: "main",
+					items: await generateMenuItem(beforExit, handleConnection),
+				}),
+				action: async (e) => {
 					toggleVisibility();
-				}
+				},
 			});
 		}
 	} catch (error) {
@@ -44,14 +46,19 @@ export async function useTray(init: boolean = false, beforExit: Function, handle
 
 	if (init) {
 		tray.setTooltip(`EasyTierGame\n${pkg.version}`);
-		tray.setShowMenuOnLeftClick(false);
-		tray.setMenu(await Menu.new({ id: "main", items: await generateMenuItem(beforExit, handleConnection) }));
+		tray.setMenuOnLeftClick(false);
+		tray.setMenu(
+			await Menu.new({
+				id: "main",
+				items: await generateMenuItem(beforExit, handleConnection),
+			})
+		);
 	}
 
 	return tray;
 }
 
-export async function generateMenuItem(beforExit: Function, handleConnection: Function) {
+export async function generateMenuItem(beforExit: Function, handleConnection:Function) {
 	return [
 		await MenuItemShow("显示 / 隐藏"),
 		await MenuItemExchangeConnection("联机 / 断开", handleConnection),
@@ -59,7 +66,7 @@ export async function generateMenuItem(beforExit: Function, handleConnection: Fu
 		await PredefinedMenuItem.new({ item: "Separator" }),
 		await MenuItemPublicPeers(),
 		await PredefinedMenuItem.new({ item: "Separator" }),
-		await MenuItemExit("退出", beforExit)
+		await MenuItemExit("退出", beforExit),
 	];
 }
 
@@ -72,17 +79,18 @@ export async function MenuItemExit(text: string, beforExit: Function) {
 				await beforExit();
 			}
 			await getCurrentWindow().close();
-		}
+		},
 	});
 }
 
 export async function MenuItemPublicPeers() {
+
 	return await MenuItem.new({
 		id: "publicPeers",
 		text: "公共节点",
 		action: async () => {
-			await open(import.meta.env.VITE_PUBLIC_PEERS_URL);
-		}
+			await open("https://easytier.gd.nkbpal.cn/status/easytier")
+		},
 	});
 }
 
@@ -92,17 +100,17 @@ export async function MenuItemShow(text: string) {
 		text,
 		action: async () => {
 			await toggleVisibility();
-		}
+		},
 	});
 }
 
-export async function MenuItemExchangeConnection(text: string, handleConnection: Function) {
-	const menutItem = await MenuItem.new({
+export async function MenuItemExchangeConnection(text: string, handleConnection:Function) {
+	const menutItem =  await MenuItem.new({
 		id: "exchangeConnection",
 		text,
 		action: async () => {
 			const isStart = await handleConnection();
-		}
+		},
 	});
 	return menutItem;
 }
@@ -113,10 +121,11 @@ export async function MenuItemTheme() {
 		text: "主题切换",
 		action: async () => {
 			const mainStore = useMainStore();
-			mainStore.$patch({ theme: !mainStore.theme });
-			// mainStore.$persist();
+			mainStore.theme = !mainStore.theme;
+			// const appWindow = getCurrentWindow();
+			// appWindow.emitTo("main", "config", { theme: mainStore.theme });
 			await setTheme(mainStore.theme);
-		}
+		},
 	});
 }
 
@@ -149,27 +158,18 @@ export async function setTrayTooltip(tray: TrayIcon | null, tooltip?: string | n
 	}
 }
 
-const versionWeight = (version: string) => {
-	version = version ? version.trim() : "";
-	const [major = "0", minor = "0", patch = "0"] = version.split(".");
-	return parseInt(major) * 10000 + parseInt(minor) * 100 + parseInt(patch);
-};
-
-const versionDifference = (current: string, latest: string) => {
-	const currentVersion = versionWeight(current);
-	const latestVersion = versionWeight(latest);
-	return currentVersion - latestVersion;
-};
 
 export const checkNewVersion = async () => {
-	const mainStore = useMainStore();
-	// if(mainStore.latestTagName && mainStore.latestTagName == pkg.version) return;
-	if (hasNewVersion.value) return;
 	let [tagName, downloadUrl] = await invoke<string[]>("fetch_game_releases");
-	mainStore.latestTagName = tagName;
-};
-
-export const hasNewVersion = computed<boolean>(() => {
-	const mainStore = useMainStore();
-	return !!mainStore.latestTagName && versionDifference(pkg.version, mainStore.latestTagName) < 0 ;
-});
+	if(tagName && pkg.version !== tagName) {
+		return true; //有新版
+		// const [err] = await ElConfirmPrimary("有新版本是否下载?", "发现新版本", {
+		// 	confirmButtonText: "下载",
+		// 	cancelButtonText: "取消",
+		// })
+		// if(!err) {
+		// 	open(downloadUrl);
+		// }
+	}
+	return false; //没有新版
+}

composables/windows.ts

@@ -67,16 +67,21 @@ export default async (
 export const dataSubscribe = async (cb?: (...args: any) => any) => {
 	if (!cb) return;
 	const mainStore = useMainStore();
-	const abort = new AbortController();
-	window.addEventListener("storage", async () => {
-		mainStore.$hydrate();
-		if (cb && cb instanceof Function) {
-			await cb();
-		}
-	}, {
-		signal: abort.signal
-	})
-	onBeforeUnmount(() => {
-		abort?.abort();
-	})
+	const currentWindow = getCurrentWindow();
+	let removeSubscribe = mainStore.$subscribe(async (...args) => {
+		const emitData = await cb(args);
+		await currentWindow.emitTo({ kind: "Window", label: "main" }, "config", emitData);
+	});
+	const unlisten = currentWindow.listen<any>("global-main-store", event => {
+		removeSubscribe && removeSubscribe();
+		mainStore.$patch({ ...event.payload.store }); // 更新全局状态
+		removeSubscribe = mainStore.$subscribe(async (...args) => {
+			const emitData = await cb(args);
+			await currentWindow.emitTo({ kind: "Window", label: "main" }, "config", emitData);
+		});
+	});
+	onBeforeUnmount(async () => {
+		unlisten && (await unlisten)();
+		removeSubscribe && removeSubscribe();
+	});
 };

env/.env.dev

@@ -1,8 +1,5 @@
 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_GAME_LIST_PATH=easytier/gameList/
-VITE_PUBLIC_PEERS_URL=https://easytier.gd.nkbpal.cn/status/easytier
 VITE_AUTO_START_SERVICE_NAME=easytierGameAutoStart

env/.env.prod

@@ -1,8 +1,5 @@
 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_GAME_LIST_PATH=easytier/gameList/
-VITE_PUBLIC_PEERS_URL=https://easytier.gd.nkbpal.cn/status/easytier
 VITE_AUTO_START_SERVICE_NAME=easytierGameAutoStart

nuxt.config.ts

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

package.json

@@ -3,7 +3,7 @@
 	"private": true,
 	"author": "leizi97",
 	"description": "A simple network initiator based on Easytier",
-	"version": "1.4.2",
+	"version": "1.3.7",
 	"scripts": {
 		"dev": "nuxt dev --dotenv env/.env.dev --host 0.0.0.0",
 		"build": "nuxt generate --dotenv env/.env.prod",
@@ -14,28 +14,29 @@
 		"@element-plus/icons-vue": "^2.3.1",
 		"@element-plus/nuxt": "^1.1.1",
 		"@nuxtjs/tailwindcss": "6.13.1",
-		"@pinia/nuxt": "0.10.1",
-		"@tauri-apps/api": "2.3.0",
-		"@tauri-apps/cli": "2.3.0",
+		"@pinia/nuxt": "0.9.0",
+		"@tauri-apps/api": "^2.2.0",
+		"@tauri-apps/cli": "2.2.4",
 		"@tauri-apps/plugin-cli": "^2.2.0",
-		"@tauri-apps/plugin-clipboard-manager": "2.2.1",
-		"@tauri-apps/plugin-dialog": "2.2.0",
+		"@tauri-apps/plugin-clipboard-manager": "2.2.0",
 		"@tauri-apps/plugin-fs": "^2.2.0",
-		"@tauri-apps/plugin-log": "2.2.2",
+		"@tauri-apps/plugin-log": "^2.2.0",
 		"@tauri-apps/plugin-shell": "^2.2.0",
-		"@tauri-apps/plugin-window-state": "2.2.1",
+		"@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.7.0",
+		"@vueuse/core": "12.4.0",
 		"archiver": "^7.0.1",
-		"element-plus": "2.9.4",
+		"element-plus": "2.9.3",
 		"less": "4.2.1",
 		"lodash-es": "^4.17.21",
-		"nuxt": "3.15.4",
-		"pinia": "3.0.1",
+		"nuxt": "3.15.2",
+		"pinia": "^2.3.0",
 		"pinia-plugin-persistedstate": "^4.2.0",
 		"postcss": "^8.4.38",
-		"prettier": "3.5.2",
-		"prettier-plugin-tailwindcss": "0.6.11"
+		"prettier": "3.4.2",
+		"prettier-plugin-tailwindcss": "0.6.10",
+		"vue-clipboard3": "^2.0.0"
 	}
 }

pages/advance.vue

@@ -43,21 +43,6 @@
 				<ElIcon><QuestionFilled /></ElIcon>
 			</ElTooltip>
 		</div>
-		<div class="flex flex-nowrap items-center gap-[5px]">
-			<ElCheckbox v-model="mainStore.config.enableKcpProxy">启用KCP代理</ElCheckbox>
-			<ElTooltip content="将TCP流量转为KCP流量，降低传输延迟，提升传输速度">
-				<ElIcon><QuestionFilled /></ElIcon>
-			</ElTooltip>
-			<CoreVersionWarning version="2.2.0" />
-		</div>
-		<div class="flex flex-nowrap items-center gap-[5px]">
-			<ElCheckbox v-model="mainStore.config.disableKcpInput">禁用KCP输入</ElCheckbox>
-			<ElTooltip content="禁用KCP入站流量，其他开启KCP代理的节点无法连接到本节点">
-				<ElIcon><QuestionFilled /></ElIcon>
-			</ElTooltip>
-			<CoreVersionWarning version="2.2.0" />
-		</div>
-		<div><ElCheckbox v-model="mainStore.config.disableUdpHolePunching">禁用UDP打洞功能</ElCheckbox></div>
 		<div><ElCheckbox v-model="mainStore.config.disableIpv6">不使用IPv6</ElCheckbox></div>
 		<ElDivider />
 		<div class="flex items-center gap-[10px]">
@@ -209,12 +194,8 @@
 		</div>
 		<ElDivider />
 
-		<div class="flex items-center gap-[10px]">
-			<ElCheckbox v-model="mainStore.config.useSmoltcp">为子网代理启用smoltcp堆栈</ElCheckbox>
-			<ElTooltip content="使用用户态TCP/IP协议栈smoltcp，避免操作系统防火墙问题导致无法子网代理">
-				<ElIcon><QuestionFilled /></ElIcon>
-			</ElTooltip>
-		</div>
+		<div><ElCheckbox v-model="mainStore.config.useSmoltcp">为子网代理启用smoltcp堆栈</ElCheckbox></div>
+		<div><ElCheckbox v-model="mainStore.config.disableUdpHolePunching">禁用UDP打洞功能</ElCheckbox></div>
 		<div class="flex flex-nowrap items-center gap-[15px]">
 			<ElCheckbox v-model="mainStore.config.saveErrorLog">输出日志到本地</ElCheckbox>
 			<div class="w-[140px]">
@@ -248,12 +229,11 @@
 	import { Command } from "@tauri-apps/plugin-shell";
 	import { exists, mkdir, BaseDirectory, remove } from "@tauri-apps/plugin-fs";
 	import { ElMessage } from "element-plus";
-	import { reactive, ref } from "vue";
+	import { reactive } from "vue";
 	import { dataSubscribe } from "@/composables/windows";
 	import { ATJ, supportProtocols } from "~/utils";
 	import CoreVersionWarning from "@/components/CoreVersionWarning.vue";
 	import { ElConfirmDanger } from "~/utils/element";
-	import { invoke } from "@tauri-apps/api/core";
 
 	const protocols = supportProtocols();
 	const listenerDialogData = reactive<{ [key: string]: any }>({
@@ -271,7 +251,6 @@
 
 	const mainStore = useMainStore();
 	const data = ["trace", "debug", "info", "warn", "error", "off"];
-	const guids = ref<string[][]>([]);
 	const openLogDir = async () => {
 		const resourceDir = await getResourceDir();
 		const logPath = import.meta.env.VITE_LOG_PATH;
@@ -284,7 +263,6 @@
 		}
 		await Command.create("explorer", [logDirPath]).execute();
 	};
-
 	const openConfigJsonDir = async () => {
 		const resourceDir = await getResourceDir();
 		const easytierDir = await join(resourceDir, "easytier/");
@@ -296,13 +274,7 @@
 		}
 	};
 
-	// 为bind_device功能增加改方法
-	const _getGuids = async () => {
-		const guidsValue = await invoke<string[][]>("get_network_adapter_guids");
-		guids.value = guidsValue && guidsValue.length > 0 ? guidsValue : [];
-	};
-
-	dataSubscribe(async () => {
+	dataSubscribe(async (...a) => {
 		if (!mainStore.createConfigInEasytier) {
 			// 考虑删除本地config.json文件
 			const configJsonPath = import.meta.env.VITE_CONFIG_FILE_NAME;
@@ -322,5 +294,9 @@
 				}
 			}
 		}
+		return {
+			config: { ...mainStore.config },
+			createConfigInEasytier: mainStore.createConfigInEasytier
+		};
 	});
 </script>

pages/cidr.vue

@@ -107,12 +107,13 @@
 
 	onMounted(async () => {
 		unlistenStart = await listenStart();
-		dataSubscribe();
 	});
 
 	onBeforeUnmount(() => {
 		unlistenStart && unlistenStart();
 	});
 
-
+	dataSubscribe(async (...a) => {
+		return { cidrEnable: mainStore.cidrEnable, config: { ...mainStore.config } };
+	});
 </script>

pages/gameList.vue

@@ -1,533 +0,0 @@
-<template>
-	<div class="relative flex h-full flex-col flex-wrap gap-[0] overflow-hidden">
-		<div class="flex h-[40px] w-full flex-nowrap items-center gap-[0_5px]">
-			<div class="ml-[5px] mr-auto flex flex-1">
-				<ElInput
-					size="small"
-					v-model="searchValue"
-					placeholder="请输入游戏名进行查询"
-				></ElInput>
-			</div>
-			<div>
-				<ElButton
-					:icon="Plus"
-					size="small"
-					type="primary"
-					class="mr-[5px]"
-					@click="handleCreate"
-				>
-					新增游戏
-				</ElButton>
-				<ElButton
-					size="small"
-					class="!ml-[0px] mr-[5px]"
-					@click="openCoverDir"
-				>
-					封面目录
-				</ElButton>
-			</div>
-		</div>
-		<div class="flex flex-1 flex-wrap gap-[0] overflow-auto">
-			<div
-				v-for="(item, idx) in computedGameList"
-				:key="item.id"
-				class="w-[25%] p-[4px]"
-			>
-				<div class="group/card relative">
-					<ElCard>
-						<template #header>
-							<div class="flex flex-nowrap gap-[0_8px]">
-								<ElTooltip :content="item.name" placement="top">
-									<p class="ml-auto flex-1 truncate">
-										<ElText
-											size="default"
-											type="info"
-										>
-											{{ item.name }}
-										</ElText>
-									</p>
-								</ElTooltip>
-							</div>
-						</template>
-						<img
-							:src="showImgConvertFileSrc(item.showImg)"
-							@error="handleImgError(item, idx)"
-							class="aspect-[1] w-full object-cover"
-						/>
-					</ElCard>
-					<div
-						class="absolute left-0 top-[61px] z-[1] hidden h-[calc(100%-61px)] w-full flex-col items-center justify-center rounded-[5px] bg-[var(--el-mask-color)] group-hover/card:flex"
-					>
-						<ElButton
-							size="large"
-							type="success"
-							:icon="VideoPlay"
-							@click.stop="handleStartGame(item)"
-						>
-							启动游戏
-						</ElButton>
-						<div class="pt-[5px]">
-							<ElButton
-								size="small"
-								type="info"
-								:icon="EditPen"
-								title="修改"
-								@click.stop="handleEditItem(item)"
-							/>
-							<ElButton
-								size="small"
-								type="danger"
-								:icon="DeleteFilled"
-								title="删除"
-								@click.stop="handleDeleteItem(item)"
-							/>
-						</div>
-					</div>
-				</div>
-			</div>
-
-			<div class="w-[25%] p-[4px]">
-				<ElTooltip content="新增本地游戏">
-					<ElCard
-						@click.stop="handleCreate"
-						shadow="hover"
-					>
-						<div class="group/plus flex cursor-pointer flex-col items-center justify-center py-[25px]">
-							<ElIcon class="!text-[80px] transition-all group-hover/plus:text-[color:var(--el-color-primary)]">
-								<Plus></Plus>
-							</ElIcon>
-							<div>
-								<ElText>支持从桌面拖放新增</ElText>
-							</div>
-						</div>
-					</ElCard>
-				</ElTooltip>
-			</div>
-		</div>
-		<ElDialog
-			width="95%"
-			top="30px"
-			append-to-body
-			:z-index="10"
-			class="!mb-0"
-			v-model="createGameData.visible"
-			:close-on-press-escape="false"
-			:title="`${createGameData.isEdit ? '编辑' : '新建'}本地游戏`"
-		>
-			<ElForm
-				hide-required-asterisk
-				label-position="left"
-				:model="createGameData.form"
-				:rules="createGameData.rules"
-				ref="formRef"
-			>
-				<ElFormItem
-					label="游戏名字"
-					prop="name"
-				>
-					<ElInput
-						v-model="createGameData.form.name"
-						placeholder="请输入游戏名字"
-					></ElInput>
-				</ElFormItem>
-				<ElFormItem
-					label="执行文件"
-					prop="exePath"
-				>
-					<ElInput
-						v-model="createGameData.form.exePath"
-						placeholder="请选择游戏执行文件"
-					>
-						<template #append>
-							<ElButton
-								size="small"
-								type="primary"
-								@click.stop="handleBrowser('exePath')"
-							>
-								浏览
-							</ElButton>
-						</template>
-					</ElInput>
-				</ElFormItem>
-				<ElFormItem
-					label="游戏封面"
-					prop="showImg"
-				>
-					<ElBadge :hidden="createGameData.form.showImg == defaultPng">
-						<template #content="{ value }">
-							<div
-								class="cursor-pointer"
-								@click.stop="handleBadgeDeleteCover"
-							>
-								<ElIcon>
-									<DeleteFilled />
-								</ElIcon>
-							</div>
-						</template>
-						<img
-							@click.stop="handleBrowser('showImg')"
-							:src="showImgConvertFileSrc(createGameData.form.showImg)"
-							class="aspect-[1] w-[120px] cursor-pointer object-cover"
-						/>
-					</ElBadge>
-				</ElFormItem>
-			</ElForm>
-			<template #footer>
-				<div><ElText type="warning">除了默认封面以外，自定义封面会集中保存在封面目录里</ElText></div>
-				<ElButton
-					size="default"
-					type="primary"
-					@click="handleSave"
-				>
-					保存
-				</ElButton>
-				<ElButton
-					size="default"
-					@click="createGameData.visible = false"
-				>
-					关闭
-				</ElButton>
-			</template>
-		</ElDialog>
-	</div>
-</template>
-<script lang="ts" setup>
-	import { VideoPlay, DeleteFilled, EditPen, Plus, Delete } from "@element-plus/icons-vue";
-	import { dataSubscribe } from "~/composables/windows";
-	import { BaseDirectory, basename, extname, resourceDir as getResourceDir, join } from "@tauri-apps/api/path";
-	import { convertFileSrc, Resource } from "@tauri-apps/api/core";
-	import { computed, nextTick, onBeforeUnmount, onMounted, reactive, ref, useTemplateRef } from "vue";
-	import useMainStore from "@/stores/index";
-	import { uniqueId } from "lodash-es";
-	import { open as dialogOpen } from "@tauri-apps/plugin-dialog";
-	import { ElMessage, type FormInstance } from "element-plus";
-	import { ATJ, bounce } from "~/utils";
-	import { ElConfirmDanger } from "~/utils/element";
-	import { copyFile, exists, mkdir, readDir, remove } from "@tauri-apps/plugin-fs";
-	import { Command, open } from "@tauri-apps/plugin-shell";
-	import { listen, type UnlistenFn } from "@tauri-apps/api/event";
-
-	const resourceDir = await getResourceDir();
-	const gameListResourceDir = await join(resourceDir, import.meta.env.VITE_GAME_LIST_PATH);
-	// const defaultLocalIconPath = await join(configPath, "icon.png");
-	// const tauriPath = convertFileSrc(defaultLocalIconPath);
-	const mainStore = useMainStore();
-	const formEl = useTemplateRef<FormInstance>("formRef");
-	const searchValue = ref("");
-	const defaultPng = "/default.png";
-	// const b = bounce(600);
-	type gameItemType = { name: string; exePath: string; id: string; showImg: string };
-	const createGameData = reactive({
-		visible: false,
-		isEdit: false,
-		form: {
-			id: "",
-			name: "",
-			exePath: "",
-			showImg: defaultPng
-		},
-		rules: {
-			name: [{ required: true, message: "请输入游戏名", trigger: "blur" }],
-			exePath: [{ required: true, message: "请选择游戏执行文件", trigger: "blur" }]
-		}
-	});
-
-	const computedGameList = computed(() => {
-		if (!searchValue.value.trim()) return mainStore.gameList;
-		return mainStore.gameList.filter(item => {
-			return item.name.includes(searchValue.value); // 过滤
-		});
-	});
-
-	const handleCreate = async () => {
-		createGameData.isEdit = false;
-		createGameData.form = {
-			id: "",
-			name: "",
-			exePath: "",
-			showImg: defaultPng
-		};
-		await nextTick();
-		createGameData.visible = true;
-	};
-
-	const handleBrowser = async (type: "showImg" | "exePath") => {
-		const filters = type === "showImg" ? [{ name: "", extensions: ["png", "jpg", "jpeg"] }] : [{ name: "", extensions: ["exe"] }];
-		const file = await dialogOpen({
-			multiple: false,
-			directory: false,
-			filters
-		});
-		if (file) {
-			if (type === "showImg") {
-				if (file) {
-					if (!createGameData.form.id) {
-						const time = new Date().getTime();
-						createGameData.form.id = uniqueId(`${time}`);
-					}
-					let showImg = file;
-					const game_list_path = import.meta.env.VITE_GAME_LIST_PATH;
-					const isExists = await exists(game_list_path, { baseDir: BaseDirectory.Resource });
-					if (!isExists) {
-						try {
-							await mkdir(game_list_path, { baseDir: BaseDirectory.Resource });
-						} catch (err) {}
-					}
-					const toPath = await join(gameListResourceDir, createGameData.form.id);
-					const suffix = showImg.split(".").pop();
-					const toPathFileName = `${toPath}.${suffix}`;
-					if (showImg != toPathFileName) {
-						await copyFile(showImg, toPathFileName);
-					}
-					// console.log(toPathFileName);
-					const isExistsToPath = await exists(toPathFileName);
-					if (isExistsToPath) {
-						const baseName = await basename(toPathFileName);
-						createGameData.form = { ...createGameData.form, showImg: `${baseName}` }; // 如果复制正确，那就存储文件名即可
-					}
-				}
-			}
-			if (type === "exePath") {
-				createGameData.form.exePath = file;
-			}
-		} else {
-			ElMessage.error("获取文件路径失败");
-		}
-	};
-
-	const openCoverDir = async () => {
-		const game_list_path = import.meta.env.VITE_GAME_LIST_PATH;
-		const isExists = await exists(game_list_path, { baseDir: BaseDirectory.Resource });
-		if (!isExists) {
-			try {
-				await mkdir(game_list_path, { baseDir: BaseDirectory.Resource });
-			} catch (err) {}
-		}
-		await Command.create("explorer", [gameListResourceDir]).execute();
-	};
-
-	const handleSave = async () => {
-		const [error, _] = await ATJ(formEl.value?.validate() as Promise<boolean>);
-		if (!error) {
-			if (createGameData.form.showImg == defaultPng) {
-				//删除本地封面图
-				// const toPath = await join(gameListResourceDir, createGameData.form.id);
-				// const imgPath = `${toPath}.${suffix}`;
-				// await remove(imgPath);
-			}
-
-			const idx = mainStore.gameList.findIndex(i => i.id == createGameData.form.id);
-			if (idx >= 0) {
-				mainStore.gameList[idx] = { ...createGameData.form };
-				mainStore.$patch({
-					gameList: [...mainStore.gameList]
-				});
-			} else {
-				mainStore.$patch({
-					gameList: [...mainStore.gameList, createGameData.form]
-				});
-			}
-
-			ElMessage.success("保存成功");
-			createGameData.visible = false;
-			// await Command.create("explorer", [gameListResourceDir]).execute();
-		}
-	};
-
-	const handleBadgeDeleteCover = async () => {
-		await removeFileById(createGameData.form.id);
-		createGameData.form = { ...createGameData.form, showImg: defaultPng };
-	};
-
-	const removeFileById = async (id: string) => {
-		if (!id) return;
-		const isExists = await exists(gameListResourceDir);
-		if (!isExists) return;
-		const entries = await readDir(gameListResourceDir);
-		if (entries.length > 0) {
-			for (const entry of entries) {
-				if (entry.name.includes(id + ".")) {
-					const imgPath = await join(gameListResourceDir, entry.name);
-					const isExists = await exists(imgPath);
-					if (!isExists) continue;
-					await remove(imgPath);
-				}
-			}
-		}
-	};
-
-	const handleDeleteItem = async ({ id }: gameItemType) => {
-		if (id) {
-			const [error, _] = await ElConfirmDanger("确定要删除吗？");
-			if (!error) {
-				await removeFileById(id);
-				mainStore.$patch({
-					gameList: mainStore.gameList.filter(i => i.id !== id)
-				});
-			}
-		}
-	};
-
-	const handleEditItem = async (item: gameItemType) => {
-		createGameData.isEdit = true;
-		createGameData.form = { ...item };
-		createGameData.visible = true;
-	};
-
-	const handleStartGame = async (item: gameItemType) => {
-		try {
-			const isExists = await exists(item.exePath);
-			if (!isExists) {
-				return ElMessage.error("执行文件不存在");
-			}
-		} catch (err) {
-			return ElMessage.error("执行文件不存在");
-		}
-
-		ElMessage.info("正在启动游戏，请稍后...");
-		const _child = await open(item.exePath);
-	};
-
-	const handleImgError = (item: gameItemType, idx: number) => {
-		item.showImg = defaultPng;
-		mainStore.gameList[idx] = { ...item };
-		mainStore.$patch({
-			gameList: [...mainStore.gameList]
-		});
-	};
-
-	const showImgConvertFileSrc = (showImg: string) => {
-		if (showImg == defaultPng) return defaultPng;
-		showImg = /^[a-z]\:/g.test(showImg.toLowerCase())
-			? `${convertFileSrc(showImg)}?${new Date().getTime()}`
-			: `${convertFileSrc(`${gameListResourceDir}\\${showImg}`)}?${new Date().getTime()}`;
-		return showImg;
-	};
-
-	let unlistenDragDrop: UnlistenFn | null = null;
-	const listenDragDrop = async () => {
-		unlistenDragDrop = await listen<{ paths: string[]; position: { x: number; y: number } }>("tauri://drag-drop", async e => {
-			const AllFiles = e.payload.paths;
-			let result: Array<gameItemType> = [];
-			const date = new Date().getTime();
-			const showImg = defaultPng;
-			const extUrls = [];
-			const lnkFiles = [];
-			for (const item of AllFiles) {
-				if (item.endsWith(".url")) {
-					extUrls.push(item);
-				} else {
-					lnkFiles.push(item);
-				}
-			}
-
-			if (lnkFiles.length > 0) {
-				// console.log(lnkFiles)
-				let lnkFilesstr = "$lnkFiles = @(";
-				for (let i = 0; i < lnkFiles.length; i++) {
-					lnkFilesstr = lnkFilesstr + `\"${lnkFiles[i]}\"`;
-					if (i == lnkFiles.length - 1) {
-						lnkFilesstr = lnkFilesstr + ");";
-					} else {
-						lnkFilesstr = lnkFilesstr + ",";
-					}
-				}
-				let forstr =
-					lnkFilesstr +
-					`
-					$shell = New-Object -ComObject WScript.Shell;
-					$results = @();
-					foreach ($lnkFile in $lnkFiles) {
-						$shortcut = $shell.CreateShortcut($lnkFile);
-						$targetPath = $shortcut.TargetPath;
-						$iconLocation = $shortcut.IconLocation;
-						$results += [PSCustomObject]@{
-							TargetPath = $targetPath
-							LinkFile = $lnkFile
-						};
-					};
-					$results | ConvertTo-Json
-				`;
-				let outputtarget = await Command.create("powershell", [`${forstr}`], {
-					encoding: "GBK"
-				}).execute();
-				let res: {
-					TargetPath: string;
-					LinkFile: string;
-				}[] = JSON.parse(outputtarget.stdout);
-				if (res && !Array.isArray(res)) {
-					res = [res];
-				}
-				if (res.length > 0) {
-					for (const idx in res) {
-						const item = res[idx];
-						// console.log(item);
-						const id = `${date}-${idx}`;
-						const exePath = item.TargetPath || item.LinkFile;
-						const namePath = item.LinkFile || item.TargetPath;
-						const allName = await basename(namePath);
-						const extName = await extname(namePath);
-						result.push({
-							exePath: exePath,
-							name: allName.replace(`.${extName}`, ""),
-							id,
-							showImg
-						});
-					}
-				}
-			}
-			if (extUrls.length > 0) {
-				for (const idx in extUrls) {
-					const TargetPath = extUrls[idx];
-					const id = `${date}-${idx}-url`;
-					const allName = await basename(TargetPath);
-					const extName = await extname(TargetPath);
-					result.push({
-						exePath: TargetPath,
-						name: allName.replace(`.${extName}`, ""),
-						id,
-						showImg
-					});
-				}
-			}
-
-			if (result.length > 0) {
-				mainStore.$patch({
-					gameList: [...mainStore.gameList, ...result]
-				});
-			}
-		});
-	};
-
-	// 兼容新的存储方式
-	const compatibleGameList = async () => {
-		const gameList = [...mainStore.gameList];
-		if(gameList.length <= 0) return;
-		const newGameList = [];
-		for(const item of gameList) {
-			const newItem = {...item}
-			if(newItem.showImg != defaultPng && /^[a-z]\:/g.test(newItem.showImg.toLowerCase())) {
-				newItem.showImg = await basename(item.showImg);
-				if(Reflect.has(newItem, "coverImg")) {
-					delete newItem['coverImg'];
-				}
-			}
-			newGameList.push(newItem);
-		}
-		mainStore.$patch({
-			gameList: newGameList
-		})
-	}
-
-	onMounted(async () => {
-		await compatibleGameList();
-		listenDragDrop(); //监听拖放
-	});
-
-	onBeforeUnmount(() =>{
-		unlistenDragDrop && unlistenDragDrop();
-	})
-
-
-	dataSubscribe();
-</script>

pages/index.vue

@@ -17,7 +17,7 @@
 							<ElIcon><QuestionFilled /></ElIcon>
 						</ElTooltip>
 					</div>
-					<div class="h-[fit-content]">-</div>
+					<span>-</span>
 					<ElTag
 						effect="dark"
 						:type="data.isSuccessGetIp ? 'success' : 'info'"
@@ -32,36 +32,25 @@
 					</ElButton>
 					<div
 						v-else
-						class="flex-1 truncate !leading-[1em]"
+						class="flex-1 truncate"
 					>
 						<ElTooltip :content="`内核版本:${data.coreVersion}(不是软件的版本)`">
-							<ElTag
-								size="small"
-								type="info"
-							>
+							<ElTag type="info">
 								{{ data.coreVersion }}
 							</ElTag>
 						</ElTooltip>
 					</div>
 					<ElTooltip content="请先停止自建服务和联机后再使用，否则内核被占用的情况下，无法进行内核更换">
-						<ElBadge
-							badge-class="!text-[9px] cursor-pointer"
-							:hidden="!haveNewCoreVersion"
-							:offset="[-5, 6]"
-							@click.stop="handleCoreManagement"
-							value="N"
+						<ElButton
+							class="ml-auto"
+							:disabled="data.isStart || listenObj.server_thread_id.value"
+							@click="handleCoreManagement"
+							:loading="data.update"
+							type="primary"
+							size="small"
 						>
-							<ElButton
-								class="ml-auto mr-[3px]"
-								:disabled="data.isStart || listenObj.server_thread_id.value"
-								@click.stop="handleCoreManagement"
-								:loading="data.update"
-								type="primary"
-								size="small"
-							>
-								内核管理
-							</ElButton>
-						</ElBadge>
+							内核管理
+						</ElButton>
 					</ElTooltip>
 				</div>
 			</template>
@@ -93,18 +82,6 @@
 						</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"
@@ -127,7 +104,7 @@
 						</p>
 						<div class="ml-auto flex-shrink-0">
 							<ElButton
-								@click.stop="copyText(item)"
+								@click.stop="copyServerUrl(item)"
 								circle
 								size="small"
 								title="复制"
@@ -153,9 +130,9 @@
 					<template #label>
 						<div class="flex items-center">
 							房间名
-							<!-- <ElTooltip content="对应命令行参数 --network-name">
+							<ElTooltip content="对应命令行参数 --network-name">
 								<ElIcon><QuestionFilled /></ElIcon>
-							</ElTooltip> -->
+							</ElTooltip>
 						</div>
 					</template>
 					<ElInput
@@ -170,9 +147,9 @@
 					<template #label>
 						<div class="flex items-center">
 							房间密码
-							<!-- <ElTooltip content="对应命令行参数 --network-secret">
+							<ElTooltip content="对应命令行参数 --network-secret">
 								<ElIcon><QuestionFilled /></ElIcon>
-							</ElTooltip> -->
+							</ElTooltip>
 						</div>
 					</template>
 					<ElInput
@@ -190,9 +167,9 @@
 				<template #label>
 					<div class="flex items-center">
 						成员名
-						<!-- <ElTooltip content="对应命令行参数 --hostname">
+						<ElTooltip content="对应命令行参数 --hostname">
 							<ElIcon><QuestionFilled /></ElIcon>
-						</ElTooltip> -->
+						</ElTooltip>
 					</div>
 				</template>
 				<ElInput
@@ -206,61 +183,38 @@
 				label="局域网IP"
 			>
 				<template #label>
-					<div class="flex h-[20px] items-center gap-[3px]">
+					<div class="flex h-[20px] items-center">
 						虚拟网IP
-						<ElButton
-							@click.stop="handleCopyIp"
-							type="primary"
-							text
-							size="small"
-							title="复制IP"
-							:icon="CopyDocument"
-						></ElButton>
+						<ElTooltip content="对应命令行参数 --ipv4">
+							<ElIcon><QuestionFilled /></ElIcon>
+						</ElTooltip>
 						<ElSwitch
 							v-model="config.dhcp"
+							class="ml-[5px]"
 							inline-prompt
 							inactive-text="固定IP"
-							active-text="动态获取"
+							active-text="动态获取IP"
 							size="small"
 						></ElSwitch>
-						<!-- <ElTooltip content="对应命令行参数 --ipv4">
-							<ElIcon><QuestionFilled /></ElIcon>
-						</ElTooltip> -->
 					</div>
 				</template>
 				<ElInput
 					maxlength="100"
-					:readonly="config.dhcp"
+					:disabled="config.dhcp"
 					:placeholder="data.isStart && config.dhcp ? '等待动态分配IP...' : '例如: 10.126.126.1'"
 					v-model="config.ipv4"
-				>
-					<template #prefix>
-						<ElTooltip
-							class="!text-[10px]"
-							placement="top-end"
-							:content="config.dhcp ? '动态获取无法手动填写' : '固定IP可以手动填写'"
-						>
-							<ElTag
-								size="small"
-								:type="config.dhcp ? 'info' : 'success'"
-							>
-								{{ config.dhcp ? "只读" : "可填" }}
-							</ElTag>
-						</ElTooltip>
-					</template>
-				</ElInput>
+				></ElInput>
 			</ElFormItem>
 		</div>
 	</ElForm>
 	<div class="mt-auto flex items-start">
 		<div>
-			<div class="pt-[4px]">
+			<div>
 				<ElDropdown
 					@command="handleStartCommand"
 					split-button
 					trigger="click"
 					size="default"
-					placement="right-end"
 					:type="!data.isStart ? 'primary' : 'danger'"
 					:disabled="data.startLoading || !data.coreVersion || data.update"
 					@click="handleConnection"
@@ -272,13 +226,13 @@
 								command="import_config"
 								:icon="Link"
 							>
-								导入联机配置
+								导入配置
 							</ElDropdownItem>
 							<ElDropdownItem
 								command="share_config"
 								:icon="Share"
 							>
-								分享联机配置
+								分享联机相关配置
 							</ElDropdownItem>
 							<ElDropdownItem disabled>
 								<ElDivider class="!m-0 !h-[2px]" />
@@ -303,32 +257,11 @@
 							>
 								使用外部配置文件
 							</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>
-							<ElDropdownItem
-								command="game_start_config"
-								:icon="SwitchFilled"
-							>
-								本地游戏列表
-							</ElDropdownItem>
 						</ElDropdownMenu>
 					</template>
 				</ElDropdown>
 			</div>
-			<div class="mt-[10px] pl-[2px]">
+			<div class="mt-[6px] pl-[2px]">
 				<ElTooltip
 					placement="left"
 					content="日志"
@@ -345,15 +278,13 @@
 					placement="left"
 					content="房间信息"
 				> -->
-				<ElButton
-					class="!ml-[7px]"
-					@click="handleShowMemberDialog"
-					plain
-					type="success"
-					size="small"
-				>
-					房间信息
-				</ElButton>
+					<ElButton
+						class="!ml-[7px]"
+						@click="handleShowMemberDialog"
+						plain
+						type="success"
+						size="small"
+					>房间信息</ElButton>
 				<!-- </ElTooltip> -->
 			</div>
 		</div>
@@ -407,7 +338,7 @@
 
 				<ElBadge
 					badge-class="!text-[9px] cursor-pointer"
-					:hidden="!hasNewVersion"
+					:hidden="!data.hasNewVersion"
 					:offset="[6, 7]"
 					value="N"
 				>
@@ -437,11 +368,8 @@
 	>
 		<div>
 			<ElText>当前版本: {{ data.coreVersion || "-" }}</ElText>
-			<div v-if="data.update">
-				<ElProgress :percentage="progress"></ElProgress>
-			</div>
 		</div>
-		<div class="mt-[5px] pb-[5px]">
+		<div class="mt-[10px] pb-[5px]">
 			<ElText class="!mr-[10px]">选择一个内核版本安装</ElText>
 			<ElButton
 				:loading="coreManagementData.loading"
@@ -484,13 +412,7 @@
 		<ElInput
 			v-model="mainStore.githubFastUrl"
 			placeholder="请输入github加速地址"
-		>
-			<template #append>
-				<ElTooltip content="github加速链接的发布地址,当前地址失效后,访问它获取最新的地址">
-					<ElButton @click="open('https://ghproxy.link/')">发布地址</ElButton>
-				</ElTooltip>
-			</template>
-		</ElInput>
+		></ElInput>
 		<template #footer>
 			<div class="text-right">
 				<ElButton
@@ -568,7 +490,7 @@
 				@click="openConfigDir"
 				size="small"
 			>
-				打开存储目录
+				打开配置目录
 			</ElButton>
 			<ElButton
 				@click="handleStartCommand('toml')"
@@ -606,98 +528,16 @@
 			</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">
-			<ElButton
-				@click="openConfigAdminDir"
-				size="small"
-			>
-				打开存储目录
-			</ElButton>
-			<ElButton
-				@click="handleStartCommand('config_admin')"
-				type="primary"
-				:icon="RefreshRight"
-				size="small"
-			>
-				刷新
-			</ElButton>
-			<ElTooltip
-				placement="top-start"
-				:offset="2"
-				:show-arrow="false"
-				content="删除选中配置"
-			>
-				<ElButton
-					class="!ml-auto"
-					:icon="Delete"
-					@click="handleDeleteAdminConfig"
-					type="danger"
-					size="small"
-				></ElButton>
-			</ElTooltip>
-		</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"
-					plain
-				>
-					关闭
-				</ElButton>
-			</div>
-		</template>
-	</ElDialog>
 </template>
 <script setup lang="ts">
 	import { invoke } from "@tauri-apps/api/core";
-	import { listen, type UnlistenFn } from "@tauri-apps/api/event";
+	import { listen } from "@tauri-apps/api/event";
 	import { open, Command } from "@tauri-apps/plugin-shell";
 	import {
 		QuestionFilled,
 		Delete,
 		List,
-		CirclePlusFilled,
+		UserFilled,
 		Setting,
 		Share,
 		RefreshRight,
@@ -706,30 +546,28 @@
 		MagicStick,
 		SetUp,
 		Folder,
-		CopyDocument,
-		Platform,
-		SwitchFilled
+		CopyDocument
 	} from "@element-plus/icons-vue";
-	import { reactive, onBeforeUnmount, onMounted, ref, toRaw, computed } from "vue";
-	import { useTray, setTrayRunState, setTrayTooltip, checkNewVersion, hasNewVersion } from "~/composables/tray";
+	import { reactive, onBeforeUnmount, onMounted, ref, toRaw } from "vue";
+	import { useTray, setTrayRunState, setTrayTooltip, checkNewVersion } from "~/composables/tray";
 	import { getMatches } from "@tauri-apps/plugin-cli";
 	import { initStartWinIpBroadcast } from "~/composables/netcard";
 	import useMainStore from "@/stores/index";
 	import { ElMessage, ElMessageBox, ElTooltip } from "element-plus";
 	import { getCurrentWindow, type Window } from "@tauri-apps/api/window";
 	import { getAllWebviewWindows, WebviewWindow } from "@tauri-apps/api/webviewWindow";
-	import etWindows, { dataSubscribe } from "@/composables/windows";
+	import etWindows from "@/composables/windows";
 	import { resourceDir as getResourceDir, join } from "@tauri-apps/api/path";
-	import { readDir, exists, mkdir, BaseDirectory, readTextFile, readFile, writeFile, remove as removeFile } from "@tauri-apps/plugin-fs";
+	import { readDir, exists, mkdir, BaseDirectory, readTextFile, readFile } from "@tauri-apps/plugin-fs";
 	import { updateConfigJson } from "~/composables/configJson";
 	import { writeText, readText } from "@tauri-apps/plugin-clipboard-manager";
 	import { sortedUniq, uniq } from "lodash-es";
-	import { bounce, addQQGroup, supportProtocols, preventSleep, stopPreventSleep, ATJ, copyText, isValidWindowsFileName } from "~/utils";
+	import { bounce, addQQGroup, supportProtocols, preventSleep, stopPreventSleep, ATJ } 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 () => {
@@ -749,12 +587,12 @@
 	const config = mainStore.config;
 	// console.error(config);
 	const protocols = supportProtocols();
-	const data = reactive({ //easytierGame有没有新版
+	const data = reactive<{ [key: string]: any; releaseList: Array<Array<string>> }>({
+		hasNewVersion: false, //easytierGame有没有新版
 		logVisible: false,
 		cidrVisible: false,
 		advanceVisible: false,
 		toolVisible: false,
-		gameListVisible: false,
 		serverVisible: false,
 		winipBcPid: 0, //WinIPBroadcast进程id
 		winipBcStart: false,
@@ -762,7 +600,7 @@
 		log: "",
 		serverLog: "", //服务端日志
 		update: false,
-		releaseList: [[]],
+		releaseList: [],
 		coreVersion: "-",
 		isSuccessGetIp: false,
 		startLoading: false,
@@ -777,13 +615,6 @@
 		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,
@@ -796,6 +627,17 @@
 		data: ""
 	});
 
+	const copyServerUrl = async (serverUrl: string) => {
+		const [err, _] = await ATJ(writeText(serverUrl));
+
+		if (!err) {
+			ElMessage.success("地址已复制");
+		} else {
+			console.error(err);
+			ElMessage.success("复制失败");
+		}
+	};
+
 	const closePrevent = async () => {
 		const appWindow = getCurrentWindow();
 		if (appWindow.label == "main") {
@@ -810,15 +652,6 @@
 		}
 	};
 
-	const handleCopyIp = async () => {
-		if (!config.ipv4?.trim()) return;
-		if (data.isStart || !config.dhcp) {
-			await copyText(mainStore.config.ipv4);
-		} else {
-			await copyText(mainStore.config.ipv4, "复制成功,联机后IP可能会变化");
-		}
-	};
-
 	const handleOpenCache = async () => {
 		const cache_path = import.meta.env.VITE_CACHE_PATH;
 		const resourceDir = await getResourceDir();
@@ -863,11 +696,23 @@
 		mainStore.basePeers = uniq([mainStore.config.serverUrl, ...mainStore.basePeers]);
 	};
 
+	// 手动触发持久化数据
+	const persist = async (appWindow: Window) => {
+		try {
+			appWindow.emitTo({ kind: "Any" }, "global-main-store", { store: { ...mainStore.$state } });
+			mainStore.$persist();
+		} catch (err) {
+			console.error(err);
+			ElMessage.error("手动持久数据失败");
+		}
+	};
+
 	const listenObj: { [key: string]: any } = {
 		unListenOutPut: null,
 		unListenThreadId: null,
 		unListenServerOutPut: null,
 		unListenServerThreadId: null,
+		unListenConfigStart: null,
 		unListenStartStopServer: null,
 		thread_id: null,
 		server_thread_id: ref(null),
@@ -952,7 +797,24 @@
 			});
 			this.unListenServerThreadId = unListen;
 		},
-
+		async listenConfigStart() {
+			const appWindow = getCurrentWindow();
+			const unListen = await listen("config", event => {
+				const ipv4 = config.ipv4;
+				mainStore.$patch(event.payload as any);
+				config.ipv4 = ipv4;
+				if (mainStore.config.enablePreventSleep) {
+					preventSleep();
+				} else {
+					stopPreventSleep();
+				}
+				persist(appWindow);
+			});
+			const unListen2 = mainStore.$subscribe(() => {
+				persist(appWindow);
+			});
+			this.unListenConfigStart = [unListen, unListen2];
+		},
 		async listenStartStopServer() {
 			const unListen = await listen<{ args: Array<string> }>("startStopServer", async event => {
 				await listenObj?.unListenServerOutPut?.();
@@ -986,18 +848,6 @@
 		data.coreVersion = (coreVersion as string).replace("easytier-core ", "");
 	};
 
-	const haveNewCoreVersion = computed<boolean>(() => {
-		if (!data.coreVersion) return false;
-		const releaseLatestVersion = data?.releaseList?.[0]?.[0];
-		if (!releaseLatestVersion) return false;
-		const version = `v${/(\d+\.\d+\.\d+)/g.exec(data.coreVersion || "")?.[1]}`;
-		// console.log(version, releaseLatestVersion)
-		if (releaseLatestVersion != version) {
-			return true;
-		}
-		return false;
-	});
-
 	const checkUpdate = async () => {
 		// const latestVersionFileName = data.releaseList?.[0]?.[0]?.[1] as string;
 		let [downloadUrl, versionFileName] = (coreManagementData.data as string).split("<>");
@@ -1029,20 +879,14 @@
 
 	const handleCoreManagement = async () => {
 		coreManagementData.visible = true;
-		// await getReleaseList();
+		await getReleaseList();
 	};
 
-	let unlistenDownload: UnlistenFn | null = null;
-	let unlistenDownloadError: UnlistenFn | null = null;
-	let progress = ref<number>(0);
-	let size = 0;
 	const handleInstallCore = async () => {
 		try {
 			if (!coreManagementData.data) {
 				return ElMessage.error("请选择一个内核");
 			}
-			progress.value = 0;
-			size = 0;
 			data.update = true;
 			await getCoreVersion();
 			const [isNeedUpdate, downloadUrl, latestVersionFileName] = await checkUpdate();
@@ -1050,22 +894,6 @@
 			if (isNeedUpdate) {
 				await reset();
 				// console.error(downloadUrl);
-				if (unlistenDownload) {
-					await unlistenDownload();
-				}
-				if (unlistenDownloadError) {
-					await unlistenDownloadError();
-				}
-				unlistenDownload = await listen<[number, number]>("download_core_progress", ({ payload }) => {
-					size += payload[0];
-					progress.value = Math.round((size / payload[1]) * 100);
-				});
-				unlistenDownloadError = await listen("download_core_progress_error", () => {
-					data.update = false;
-					progress.value = 0;
-					size = 0;
-					ElMessage.error("发生错误，请重试");
-				});
 				await invoke("download_easytier_zip", { download_url: downloadUrl, file_name: latestVersionFileName });
 			}
 			await getCoreVersion();
@@ -1084,13 +912,12 @@
 				// console.log(el, el[0], el[2]);
 				return el && el[0] && el[2] && !el[2].includes("gui");
 			})
-		] as any;
+		];
 		coreManagementData.loading = false;
 		// console.log(data.releaseList);
 	};
 
 	const handleAutoStartByTask = async () => {
-		if (import.meta.env.DEV) return ElMessage.warning("开发环境不支持开机自启");
 		await invoke("spawn_autostart", { enabled: !config.autoStart });
 		const is_enable_by_task = (await invoke("autostart_is_enabled")) as boolean;
 		config.autoStart = is_enable_by_task;
@@ -1101,7 +928,6 @@
 			let is_enable_by_task = (await invoke("autostart_is_enabled")) as boolean;
 			if (is_enable_by_task) {
 				// 每次打开Exe重新加载一次开机自启，因为可能路径变了
-				if (import.meta.env.DEV) return ElMessage.warning("开发环境不支持开机自启");
 				await invoke("spawn_autostart", { enabled: false });
 				await invoke("spawn_autostart", { enabled: true });
 			}
@@ -1131,12 +957,10 @@
 				try {
 					const decoder = new TextDecoder("utf-8");
 					const guiJsonStr = decoder.decode(guiJsonStrUint8);
-					// console.log(guiJsonStr);
-					// const regex = /^(\s*\/\/.*)/gm;
-					// const regex2 = /(,?)\s*\/\/.*(?=\n|$|\r\n)/gm;
-					// const resultStr = guiJsonStr.replace(regex, "").replace(regex2, "$1");
-					// console.log(resultStr);
-					const guiJson = JSON.parse(guiJsonStr);
+					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)) {
@@ -1154,7 +978,6 @@
 						config: {
 							...mainStore.config,
 							...guiJson,
-							customListenerData: guiJson?.customListenerData.join("\n") || "",
 							serverUrl: saveServerUrl
 						}
 					});
@@ -1171,6 +994,14 @@
 				}
 			}
 		}
+		const b = bounce(600);
+		mainStore.$subscribe(async (...a) => {
+			if (mainStore.createConfigInEasytier) {
+				b(async () => {
+					await updateConfigJson(data.configJsonSeverUrl);
+				});
+			}
+		});
 	};
 
 	const initAutoStartServer = async () => {
@@ -1206,7 +1037,6 @@
 	let serverLogsTimer: NodeJS.Timeout | null = null;
 	let cidrTimer: NodeJS.Timeout | null = null;
 
-	const b = bounce(600);
 	onMounted(async () => {
 		await initGuiJson();
 		await compatibleInitAutoStart();
@@ -1215,6 +1045,7 @@
 		await getCoreVersion();
 		await listenObj.listenThreadId();
 		await listenObj.listenServerThreadId();
+		await listenObj.listenConfigStart();
 		await listenObj.listenStartStopServer();
 		await initConfigDir();
 		await initAutoStartServer();
@@ -1222,20 +1053,14 @@
 		initPreventSleep();
 		mountedShow(); // 不需要await
 		closePrevent();
-		dataSubscribe(async () => {
-			if (mainStore.createConfigInEasytier) {
-				b(async () => {
-					await updateConfigJson(data.configJsonSeverUrl);
-				});
-			}
-		});
-		getReleaseList();
-		checkNewVersion();
+		data.hasNewVersion = await checkNewVersion();
 	});
 
 	onBeforeUnmount(() => {
 		unListenAll();
 		listenObj.unListenReleaseList && listenObj.unListenReleaseList();
+		listenObj.unListenConfigStart && listenObj.unListenConfigStart[0]();
+		listenObj.unListenConfigStart && listenObj.unListenConfigStart[1]();
 		listenObj.unListenStartStopServer && listenObj.unListenStartStopServer();
 		logsTimer && clearInterval(logsTimer);
 		serverLogsTimer && clearInterval(serverLogsTimer);
@@ -1368,12 +1193,6 @@
 		if (config.compression && config.compression != "none") {
 			args.push("--compression", config.compression);
 		}
-		if (config.enableKcpProxy) {
-			args.push("--enable-kcp-proxy");
-		}
-		if (config.disableKcpInput) {
-			args.push("--disable-kcp-input");
-		}
 		return args;
 	};
 
@@ -1431,26 +1250,21 @@
 			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, recursive: true });
-				} catch (err) {
-					console.error(err);
-					return;
-				}
+					await mkdir(path, { baseDir: BaseDirectory.Resource });
+				} catch (err) {}
 			}
-			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 {
@@ -1480,9 +1294,7 @@
 					disableUdpHolePunching,
 					relayAllPeerrpc,
 					compression,
-					enablePreventSleep,
-					enableKcpProxy,
-					disableKcpInput
+					enablePreventSleep
 				} = mainStore.config;
 				const WT = btoa(
 					encodeURIComponent(
@@ -1513,9 +1325,7 @@
 								disableUdpHolePunching,
 								relayAllPeerrpc,
 								compression,
-								enablePreventSleep,
-								enableKcpProxy,
-								disableKcpInput
+								enablePreventSleep
 							}
 						})
 					)
@@ -1535,6 +1345,7 @@
 				console.error(err);
 				ElMessage.error("分享失败");
 			}
+			
 		}
 		if (command === "import_config") {
 			importConfigData.data = "";
@@ -1543,140 +1354,6 @@
 		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个字以上的存储名",
-					closeOnPressEscape: false,
-					closeOnClickModal: false,
-					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("保存成功");
-				}
-			}
-		}
-
-		if (command === "game_start_config") {
-			await etWindows(
-				"gameList",
-				{
-					title: "本地游戏列表",
-					width: 800,
-					height: 400,
-					minWidth: 800,
-					minHeight: 400,
-					resizable: true,
-					url: "#/gameList"
-				},
-				(_, appWindow) => {
-					data.gameListVisible = true;
-				},
-				() => {
-					data.gameListVisible = false;
-				}
-			);
-		}
-	};
-
-	const handleDeleteAdminConfig = async () => {
-		const path = configAdminData.fileName;
-		if (!path) return ElMessage.warning("请选择配置");
-		const [err] = await ElConfirmDanger("确定{action}选中的配置吗?", "提示", {
-			confirmButtonText: "确定",
-			cancelButtonText: "取消",
-			action: "删除"
-		});
-		if (err) return;
-		try {
-			await removeFile(path, { baseDir: BaseDirectory.Resource });
-			ElMessage.success("删除成功");
-			configAdminData.fileName = "";
-			await handleStartCommand("config_admin");
-		} catch (err) {
-			ElMessage.error("删除配置失败");
-			console.log(err);
-		}
-	};
-
-	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 () => {
@@ -1724,12 +1401,6 @@
 		// 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) {

pages/member.vue

@@ -39,7 +39,7 @@
 							effect="dark"
 							:type="row.cost == 'p2p' ? 'success' : 'info'"
 						>
-							{{ row.cost ? row.cost.replace("relay", "中转").replace("p2p", "直连") : row.cost }}
+							{{ row.cost ? row.cost.replace("relay", "中转") : row.cost }}
 						</ElTag>
 					</template>
 				</ElTableColumn>

pages/server.vue

@@ -123,6 +123,8 @@
 		await appWindow.emitTo("main", "startStopServer", { args });
 	};
 
-	dataSubscribe();
+	dataSubscribe(async (...a) => {
+		return { serverConfig: { ...mainStore.serverConfig }};
+	});
 
 </script>

pages/tool.vue

@@ -42,7 +42,7 @@
 				</div>
 				<div>
 					<ElTooltip
-						content="使用ForceBindIP启动应用 (强制绑定IP或者网卡)，如果还没有启动联机，请先启动联机，联机成功后，点击刷新获取easytier生成的网卡"
+						content="使用ForceBindIP启动应用 (强制绑定IP或者网卡)，如果还有没启动联机，请先启动联机，联机成功后，点击刷新获取easytier生成的网卡"
 					>
 						<ElText>
 							方案2
@@ -477,6 +477,19 @@
 		}
 	};
 
+	dataSubscribe(async (...a) => {
+		return {
+			winIpBcAutoStart: mainStore.winIpBcAutoStart,
+			winipBcStart: mainStore.winipBcStart,
+			winipBcPid: mainStore.winipBcPid,
+			forceBindIpBit: mainStore.forceBindIpBit,
+			delayInjectDll: mainStore.delayInjectDll,
+			forceBindInput: mainStore.forceBindInput,
+			forceBindFile: mainStore.forceBindFile,
+			config: { ...mainStore.config }
+		};
+	});
+
 	const getGuids = async () => {
 		const guids = await invoke<string[][]>("get_network_adapter_guids");
 		data.guids = guids && guids.length > 0 ? guids : [];
@@ -492,6 +505,5 @@
 		data.pingIp = mainStore.config.ipv4;
 		initStartWinIpBroadcast();
 		getGuids();
-		dataSubscribe();
 	});
 </script>

src-tauri/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "easytier-game"
-version = "1.4.2"
+version = "1.3.7"
 homepage = "https://github.com/EasyTier/EasyTier"
 repository = "https://github.com/EasyTier/EasytierGame"
 description = "A simple network initiator based on Easytier"
@@ -18,41 +18,41 @@ name = "app_lib"
 crate-type = ["staticlib", "cdylib", "rlib"]
 
 [build-dependencies]
-tauri-build = { version = "2.0.6", features = [] }
+tauri-build = { version = "2.0.5", features = [] }
 # prost-build = "0.13.2"
 
 [dependencies]
-serde_json = "1.0.137"
+serde_json = "1.0.135"
 serde = { version = "1.0.217", features = ["derive"] }
-log = "0.4.26"
-tauri = { version = "2.3.0", features = [ "protocol-asset",
+log = "0.4.25"
+tauri = { version = "2.2.2", features = [
     "tray-icon",
     "image-png",
-    "image-ico"
+    "image-ico",
+    "devtools"
 ] }
 
-tauri-plugin-log = "2.2.2"
+tauri-plugin-log = "2.2.0"
 tauri-plugin-shell = "2.2.0"
 reqwest = { version = "0.12.12", features = ["json"] }
-zip = "2.2.3"
+zip = "2.2.2"
 sysinfo = '0.33.1'
 planif = { git = "https://github.com/mattrobineau/planif", tag = "1.0.1" }
 whoami = "1.5.2"
 tauri-plugin-fs = "2.2.0"
-tauri-plugin-clipboard-manager = "2.2.1"
-rand = "0.9.0"
+tauri-plugin-clipboard-manager = "2.2.0"
+rand = "0.8.5"
 tokio = { version = "1.43.0", features = ["process"] }
 tauri-plugin-dialog = "2.2.0"
 # prost = "0.13"
 # prost-types = "0.13"
 hashbrown = "0.15.2"
-# futures-util = "0.3"
 
 [dependencies.windows]
 version = "0.58.0"
-features = ["Win32_System_TaskScheduler", "Win32_System_Com", "Win32_System_Power", "Win32_NetworkManagement_IpHelper", "Win32_NetworkManagement_Ndis", "Win32_Networking_WinSock"]
+features = ["Win32_System_TaskScheduler", "Win32_System_Power", "Win32_NetworkManagement_IpHelper", "Win32_NetworkManagement_Ndis", "Win32_Networking_WinSock"]
 
 [target."cfg(not(any(target_os = \"android\", target_os = \"ios\")))".dependencies]
 tauri-plugin-cli = "2.2.0"
-tauri-plugin-single-instance = "2.2.2"
-tauri-plugin-window-state = "2.2.1"
+tauri-plugin-single-instance = "2.2.1"
+tauri-plugin-window-state = "2.2.0"

src-tauri/capabilities/default.json

@@ -2,7 +2,7 @@
 	"$schema": "../gen/schemas/desktop-schema.json",
 	"identifier": "default",
 	"description": "enables the default permissions",
-	"windows": ["main", "log", "member", "cidr", "advance", "tool", "server", "gameList"],
+	"windows": ["main", "log", "member", "cidr", "advance", "tool", "server"],
 	"permissions": [
 		"core:default",
 		"core:window:allow-minimize",
@@ -88,19 +88,11 @@
 					"args": true,
 					"cmd": "ping",
 					"name": "ping"
-				},
-				{
-					"args": true,
-					"cmd": "powershell",
-					"name": "powershell"
 				}
 			]
 		},
 		"fs:default",
-		{
-			"identifier": "fs:allow-read-dir",
-			"allow": [{ "path": "$DESKTOP" }, { "path": "$DESKTOP/*" }, { "path": "**/*" }, { "path": "**" }]
-		},
+		"fs:allow-read-dir",
 		"fs:allow-exists",
 		"fs:allow-open",
 		"fs:allow-resource-read",

src-tauri/easytier/config_template.json

@@ -4,37 +4,25 @@
         "tcp",
         "udp"
     ], // 协议类型
+    
     // easytier服务地址 - 可填写多个 方式1，逗号分隔，"xxxx.cn,yyyy.com" 方式2,数组 ["xxxx.cn","yyyy.com"] （默认选中第一个）
-    "serverUrl": "public.easytier.top:11010",
-    "enableCustomListener": true,
-    "customListenerData": [
-        "tcp://0.0.0.0:11010",
-        "udp://0.0.0.0:11010",
-        "tcp://[::]:11010"
-    ],
-    "networkName": "",  //房间名
-    "networkPassword": "", //房间密码
-    "hostname": "", //主机名
-    "ipv4": "", // 虚拟IP地址
-    "disableIpv6": false,  // 禁用ipv6
-    "enableCustomListenerV6": true, // 启用ipv6监听
-    "customListenerV6Data": "udp://[::]:11010",  // ipv6监听地址
-    "disbleListenner": false, //    禁用监听
+    "serverUrl": "public.easytier.top:11010", 
+    "networkName": "",  // 网络名
+    "networkPassword": "", // 网络密码
+    "hostname": "configTest", // 主机名
+    "ipv4": "10.126.126.1", // IP地址(选填，下面有dhcp)
+    "disableIpv6": false, // 禁用ipv6
+    "disbleListenner": true, // 禁用端口监听
     "disableEncryption": false, // 禁用加密
-    "enablExitNode": false, // 启用出口节点
     "noTun": false, // 禁用tun
     "latencyfirst": false, // 延迟优先
-    "disableUdpHolePunching": false,  // 禁用udp打洞
-    "disbleP2p": false, // 禁用p2p 强制中转
-    "dhcp": true, // 启用dhcp,动态获取IP
-    "devName": true, // 启用自定义网卡名
-    "devNameValue": "etgame", // 自定义网卡名
-    "enableCustomProtocol": true, // 自定义p2p时默认协议
-    "customProtocol": "tcp", // 自定义p2p时使用的协议类型
-    "enableNetCardMetric": true, // 启用自定义网卡跃点
-    "netCardMetricValue": 1, // 网卡跃点
-    "enablePreventSleep": false, // 启用防止睡眠
-    "compression": "none", // 压缩算法
-    "enableKcpProxy": true, // 启用kcp代理
-    "disableKcpInput": false //     禁用kcp输入
+    "disableUdpHolePunching": false, // 禁用udp打洞
+    "disbleP2p": false,  // 禁用p2p, 强制中转
+    "dhcp": false,  // 动态分配IP
+    "devName": false, // 是否启用自定义网卡名
+    "devNameValue": "", // 网卡名(启用devName之后才生效)
+    "enableCustonProtocol": false,  // 是否启用自定义协议
+    "customProtocol": "tcp", // 自定义协议类型
+    "enableNetCardMetric": false,  // 自定义easytier每次生成的网卡跃点
+    "netCardMetricValue": 1 // 网卡跃点数量(1-9999)
 }

src-tauri/src/lib.rs

@@ -3,7 +3,6 @@ use planif::schedule::TaskScheduler as planIfTaskScheduler;
 use planif::schedule_builder::{Action, ScheduleBuilder};
 use planif::settings::{Duration, LogonType, PrincipalSettings, RunLevel};
 use reqwest::{Client, Error};
-// use futures_util::StreamExt;
 use serde::{Deserialize, Serialize};
 use std::collections::HashMap;
 use std::fs::{self, File};
@@ -92,13 +91,13 @@ fn generate_random_user_agent() -> String {
         "Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:{version}) Gecko/20100101 Firefox/{version}",
     ];
 
-    let mut rng = rand::rng();
-    let template = user_agents[rng.random_range(0..user_agents.len())];
+    let mut rng = rand::thread_rng();
+    let template = user_agents[rng.gen_range(0..user_agents.len())];
 
     // 生成随机版本号
-    let version_major: u8 = rng.random_range(70..90);
-    let version_minor: u8 = rng.random_range(0..10);
-    let version_patch: u8 = rng.random_range(0..10);
+    let version_major: u8 = rng.gen_range(70..90);
+    let version_minor: u8 = rng.gen_range(0..10);
+    let version_patch: u8 = rng.gen_range(0..10);
     let version = format!("{}.{}.{}", version_major, version_minor, version_patch);
 
     // 替换模板中的版本号占位符
@@ -326,7 +325,7 @@ async fn get_route_by_cli() -> String {
 }
 
 #[tauri::command(rename_all = "snake_case")]
-async fn download_easytier_zip(app_handle: tauri::AppHandle ,download_url: String, file_name: String) {
+async fn download_easytier_zip(download_url: String, file_name: String) {
     let cache_dir_path = get_tool_exe_path("\\easytier\\cache");
     let cache_file_name = format!("{}\\{}", cache_dir_path, file_name);
     let cache_file_name_path = path::Path::new(&cache_file_name);
@@ -336,12 +335,12 @@ async fn download_easytier_zip(app_handle: tauri::AppHandle ,download_url: Strin
     }
 
     let target = format!("{}", download_url);
-    let mut response = reqwest::get(target)
+    let response = reqwest::get(target)
         .await
         .expect("error to download easytier url");
     let easytier_path = get_tool_exe_path("\\easytier");
     let file_path = format!("{}\\{}", easytier_path, file_name);
-    // println!("download easytier to {}", file_path);
+    println!("download easytier to {}", file_path);
 
     let easytier_dir = path::Path::new(&easytier_path);
     if !easytier_dir.exists() {
@@ -355,20 +354,11 @@ async fn download_easytier_zip(app_handle: tauri::AppHandle ,download_url: Strin
         Err(why) => panic!("couldn't create {}", why),
         Ok(file) => file,
     };
-    let context_size: u64 = response.content_length().unwrap();
-    while let Some(item) = response.chunk().await.unwrap() {
-        match file.write_all(&item) {
-            Ok(_) => {
-                app_handle.emit("download_core_progress", [item.len() as u64, context_size]).expect("error to emit download_core_progress");
-            },Err(why) => {
-                log::error!("error to write file: {}", why);
-                app_handle.emit("download_core_progress_error", why.to_string()).expect("error to emit download_core_progress_error");
-                return
-            }
-        };
-        
-    }
-    println!("下载完成");
+
+    let content = response.bytes().await.expect("error to bytes easytier");
+    println!("下载完成，开始写入");
+    file.write_all(&content).expect("error to write easytier");
+    println!("写入完成");
     unzip(path);
 
     let cache_dir_path = path::Path::new(&cache_dir_path);

src-tauri/tauri.conf.json

@@ -1,18 +1,19 @@
 {
 	"$schema": "../node_modules/@tauri-apps/cli/config.schema.json",
 	"productName": "easytier-game",
-	"version": "1.4.2",
+	"version": "1.3.7",
 	"identifier": "com.tauri.easytier-game",
 
 	"build": {
 		"frontendDist": "../dist",
 		"devUrl": "http://localhost:5000",
+		"beforeBuildCommand": "pnpm build",
 		"beforeDevCommand": "pnpm dev"
 	},
 	"app": {
 		"windows": [
 			{
-				"title": "easytier-game 1.4.2",
+				"title": "easytier-game 1.3.7",
 				"label": "main",
 				"minWidth": 340,
 				"width": 340,
@@ -30,11 +31,7 @@
 			}
 		],
 		"security": {
-			"csp": null,
-			"assetProtocol": {
-				"enable": true,
-				"scope": ["**"]
-			}
+			"csp": null
 		}
 	},
 	"plugins": {

src-tauri/帮助.txt

@@ -8,14 +8,12 @@
 
 
 [如果想彻底删除easytierGame]
---
+
 1. 关闭easytierGame
 
 2. 运行easytier-game安装目录下的 easytier/clear_local_data.bat (需要管理员权限) 输入y确认，清除本地存储数据
 
 3. 删除easytierGame文件夹
---
-或者直接使用uninstall.exe
 
 
 [没有服务器，怎么自建服务]

stores/index.ts

@@ -15,8 +15,8 @@ const store = defineStore("main", {
 				disableIpv6: false, // 是否禁用IPv6
 				port: "11010", // 监听端口号
 				enableCustomListener: true, // 是否自定义监听
-				enableCustomListenerV6: true, // 是否自定义IPV6监听
-				customListenerV6Data: "udp://[::]:11010", //自定义ipv6监
+				customListenerV6Data: "udp://[::]:11010", //自定义ipv6监听
+				enableCustomListenerV6: true, // 是否自定义监听
 				customListenerData: "tcp://0.0.0.0:11010\nudp://0.0.0.0:11010\ntcp://[::]:11010", // 自定义监听地址
 				disbleListenner: false, // 是否禁用监听
 				disableEncryption: false, // 是否禁用加密
@@ -39,8 +39,6 @@ const store = defineStore("main", {
 				netCardMetricValue: 1, //自定义网卡跃点值
 				enablePreventSleep: false, //组织系统休眠
 				compression: "none", //加密算法
-				enableKcpProxy: true, //启用kcp代理  默认开启
-				disableKcpInput: false //禁用kcp输入
 			},
 			serverConfig: {
 				enableWhiteList: true, // 是否启用白名单
@@ -51,13 +49,13 @@ const store = defineStore("main", {
 				port: "11010" // 服务器端口
 			},
 			cidrEnable: false,
-			basePeers: ["public.easytier.top:11010", "public.easytier.net:11010"],
+			basePeers: ["public.easytier.top:11010","public.easytier.net:11010"],
 			theme: false, //主题  false light true dark
 			configStartEnable: false, //使用配置文件启动
 			configPath: "", //配置文件路径
 			winIpBcAutoStart: true,
 			createConfigInEasytier: false, //在easytier目录生成config.json文件吗
-			githubFastUrl: "https://ghfast.top/",
+			githubFastUrl: "https://ghproxy.cc/",
 
 			// forceBindIp配置
 			forceBindIpBit: "64",
@@ -66,10 +64,7 @@ const store = defineStore("main", {
 			forceBindFile: "",
 
 			winipBcPid: 0,
-			winipBcStart: false,
-			latestTagName: "",
-
-			gameList: [] as Array<{ name: string; exePath: string; id: string; coverImg?: string; showImg: string }> // 游戏列表
+			winipBcStart: false
 		};
 	},
 	persist: {
@@ -102,7 +97,7 @@ const store = defineStore("main", {
 			"config.enableNetCardMetric",
 			"config.netCardMetricValue",
 			"config.port",
-
+			
 			"config.disbleListenner",
 			"config.enableCustomListener",
 			"config.customListenerData",
@@ -114,9 +109,6 @@ const store = defineStore("main", {
 			"config.enablePreventSleep",
 			"config.compression",
 
-			"config.enableKcpProxy",
-			"config.disableKcpInput",
-
 			"serverConfig.autoStart",
 			// 'serverConfig.enableListener',
 			"serverConfig.enableWhiteList",
@@ -136,10 +128,7 @@ const store = defineStore("main", {
 			"forceBindIpBit",
 			"delayInjectDll",
 			"forceBindInput",
-			"forceBindFile",
-			"latestTagName",
-			
-			"gameList"
+			"forceBindFile"
 		]
 		// // 除了这些，其他都要存下来
 		// omit: ["winipBcPid", "winipBcStart"]

typings/index.d.ts

@@ -4,7 +4,6 @@ interface ImportMetaEnv {
 	readonly VITE_LOG_PATH: string;
 	readonly VITE_CACHE_PATH: string;
 	readonly VITE_AUTO_START_SERVICE_NAME: string;
-	readonly VITE_GAME_LIST_PATH: string;
 }
 
 interface ImportMeta {

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

@@ -1,7 +1,5 @@
 import { invoke } from "@tauri-apps/api/core";
-import { writeText } from "@tauri-apps/plugin-clipboard-manager";
 import { open } from "@tauri-apps/plugin-shell";
-import { ElMessage } from "element-plus";
 export const ENV = import.meta.env;
 
 //防抖
@@ -53,8 +51,8 @@ export const numRemoveZero = (num: Number) => {
 // await-to-js
 export const ATJ = (promise: Promise<any>, errorExt: string | undefined = undefined) => {
 	return promise
-		.then(data => [null, data])
-		.catch(err => {
+		.then((data) => [null, data])
+		.catch((err) => {
 			if (errorExt) {
 				if (typeof errorExt !== "object") {
 					return [errorExt, undefined];
@@ -71,26 +69,26 @@ const _supportProtocols = ["tcp", "udp", "ws", "wss", "quic"];
 
 export const supportProtocols = () => {
 	return _supportProtocols.slice();
-};
+}
 
-let _prevent_timer: NodeJS.Timeout | null = null;
+let _prevent_timer: NodeJS.Timeout| null = null;
 let _prevent_timer_count = 15; // 秒
 export const preventSleep = () => {
 	_prevent_timer && clearInterval(_prevent_timer);
 	_prevent_timer = setInterval(async () => {
-		const result = await invoke("prevent_sleep");
+	    const result = await invoke('prevent_sleep');
 		// console.log(`trigger prevent sleep ${result}`);
 	}, _prevent_timer_count * 1000);
-};
+}
 
 export const stopPreventSleep = async () => {
 	_prevent_timer && clearInterval(_prevent_timer);
 	_prevent_timer = null;
-	const _result = await invoke("allow_sleep");
-};
+	const _result = await invoke('allow_sleep');
+}
 
 export const parseCliInfo = (content: string) => {
-	if (!content) return [];
+	if(!content) return [];
 	// 将表格字符串分割成行
 	const lines = content.split("\n");
 
@@ -98,7 +96,7 @@ export const parseCliInfo = (content: string) => {
 	const headers = lines[1]
 		.split("│")
 		.slice(1, -1)
-		.map(h => h.trim());
+		.map((h) => h.trim());
 
 	// 初始化结果数组
 	const result: any[] = [];
@@ -111,7 +109,7 @@ export const parseCliInfo = (content: string) => {
 		const values = lines[i]
 			.split("│")
 			.slice(1, -1)
-			.map(v => v.trim());
+			.map((v) => v.trim());
 
 		// 创建对象并添加到结果数组
 		const obj: any = {};
@@ -126,20 +124,6 @@ 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");
 };
@@ -150,14 +134,3 @@ export function isValidIP(ip: string) {
 	const ipv6Pattern = /^(?:[A-Fa-f0-9]{1,4}:){7}[A-Fa-f0-9]{1,4}$/;
 	return ipv4Pattern.test(ip) || ipv6Pattern.test(ip);
 }
-
-export const copyText = async (text: string, message: string = "复制成功") => {
-	const [err, _] = await ATJ(writeText(text));
-
-	if (!err) {
-		ElMessage.success(message);
-	} else {
-		console.error(err);
-		ElMessage.success("复制失败");
-	}
-};