增加版本号权重校验，发布1.4.2

+ tauri升级为最新版
+ 包体统一升级更新

.gitignore

@@ -12,3 +12,5 @@ dist
 release
 
 src-tauri/easytier/logs
+src-tauri/easytier/tool/ResourcesExtract.exe
+src-tauri/easytier/tool/ResourcesExtract.cfg

.nvmdrc

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

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,16 +51,24 @@ html.dark body {
 }
 
 .el-table {
-	font-size: 12px!important;
+	font-size: 12px !important;
 }
 
 .el-select-dropdown__wrap {
-	max-height: 138px!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;
+	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;
 }

build.bat

@@ -1,3 +1,4 @@
+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

composables/configJson.ts

@@ -14,23 +14,15 @@ 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),
@@ -43,7 +35,11 @@ export const updateConfigJson = async (configJsonSeverUrl: Array<string> | strin
 				mainStore.basePeers
 			).join(",");
 		}
-		await writeTextFile(path, JSON.stringify({ serverUrl: writeServerUrl, ...otherConfig }, null, 4), { baseDir: BaseDirectory.Resource });
+		await writeTextFile(
+			path,
+			JSON.stringify({ serverUrl: writeServerUrl, enableCustomListener, customListenerData: writeCustomListenerData, ...otherConfig }, null, 4),
+			{ baseDir: BaseDirectory.Resource }
+		);
 	} catch (err) {
 		console.error(err);
 		ElMessage.error(`更新config.json失败`);

composables/icon.ts

@@ -0,0 +1,33 @@
+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,6 +8,7 @@ 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";
 
@@ -30,13 +31,10 @@ 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) {
@@ -47,18 +45,13 @@ 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.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),
@@ -66,7 +59,7 @@ export async function generateMenuItem(beforExit: Function, handleConnection:Fun
 		await PredefinedMenuItem.new({ item: "Separator" }),
 		await MenuItemPublicPeers(),
 		await PredefinedMenuItem.new({ item: "Separator" }),
-		await MenuItemExit("退出", beforExit),
+		await MenuItemExit("退出", beforExit)
 	];
 }
 
@@ -79,18 +72,17 @@ 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(import.meta.env.VITE_PUBLIC_PEERS_URL);
+		}
 	});
 }
 
@@ -100,17 +92,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;
 }
@@ -121,11 +113,10 @@ export async function MenuItemTheme() {
 		text: "主题切换",
 		action: async () => {
 			const mainStore = useMainStore();
-			mainStore.theme = !mainStore.theme;
-			// const appWindow = getCurrentWindow();
-			// appWindow.emitTo("main", "config", { theme: mainStore.theme });
+			mainStore.$patch({ theme: !mainStore.theme });
+			// mainStore.$persist();
 			await setTheme(mainStore.theme);
-		},
+		}
 	});
 }
 
@@ -158,18 +149,27 @@ 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");
-	if(tagName && pkg.version !== tagName) {
-		return true; //有新版
-		// const [err] = await ElConfirmPrimary("有新版本是否下载?", "发现新版本", {
-		// 	confirmButtonText: "下载",
-		// 	cancelButtonText: "取消",
-		// })
-		// if(!err) {
-		// 	open(downloadUrl);
-		// }
-	}
-	return false; //没有新版
-}
+	mainStore.latestTagName = tagName;
+};
+
+export const hasNewVersion = computed<boolean>(() => {
+	const mainStore = useMainStore();
+	return !!mainStore.latestTagName && versionDifference(pkg.version, mainStore.latestTagName) < 0 ;
+});

composables/windows.ts

@@ -67,21 +67,16 @@ export default async (
 export const dataSubscribe = async (cb?: (...args: any) => any) => {
 	if (!cb) return;
 	const mainStore = useMainStore();
-	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();
-	});
+	const abort = new AbortController();
+	window.addEventListener("storage", async () => {
+		mainStore.$hydrate();
+		if (cb && cb instanceof Function) {
+			await cb();
+		}
+	}, {
+		signal: abort.signal
+	})
+	onBeforeUnmount(() => {
+		abort?.abort();
+	})
 };

env/.env.dev

@@ -3,5 +3,6 @@ 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

@@ -3,5 +3,6 @@ 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

package.json

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

pages/advance.vue

@@ -43,6 +43,21 @@
 				<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]">
@@ -194,8 +209,12 @@
 		</div>
 		<ElDivider />
 
-		<div><ElCheckbox v-model="mainStore.config.useSmoltcp">为子网代理启用smoltcp堆栈</ElCheckbox></div>
-		<div><ElCheckbox v-model="mainStore.config.disableUdpHolePunching">禁用UDP打洞功能</ElCheckbox></div>
+		<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 class="flex flex-nowrap items-center gap-[15px]">
 			<ElCheckbox v-model="mainStore.config.saveErrorLog">输出日志到本地</ElCheckbox>
 			<div class="w-[140px]">
@@ -229,11 +248,12 @@
 	import { Command } from "@tauri-apps/plugin-shell";
 	import { exists, mkdir, BaseDirectory, remove } from "@tauri-apps/plugin-fs";
 	import { ElMessage } from "element-plus";
-	import { reactive } from "vue";
+	import { reactive, ref } 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 }>({
@@ -251,6 +271,7 @@
 
 	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;
@@ -263,6 +284,7 @@
 		}
 		await Command.create("explorer", [logDirPath]).execute();
 	};
+
 	const openConfigJsonDir = async () => {
 		const resourceDir = await getResourceDir();
 		const easytierDir = await join(resourceDir, "easytier/");
@@ -274,7 +296,13 @@
 		}
 	};
 
-	dataSubscribe(async (...a) => {
+	// 为bind_device功能增加改方法
+	const _getGuids = async () => {
+		const guidsValue = await invoke<string[][]>("get_network_adapter_guids");
+		guids.value = guidsValue && guidsValue.length > 0 ? guidsValue : [];
+	};
+
+	dataSubscribe(async () => {
 		if (!mainStore.createConfigInEasytier) {
 			// 考虑删除本地config.json文件
 			const configJsonPath = import.meta.env.VITE_CONFIG_FILE_NAME;
@@ -294,9 +322,5 @@
 				}
 			}
 		}
-		return {
-			config: { ...mainStore.config },
-			createConfigInEasytier: mainStore.createConfigInEasytier
-		};
 	});
 </script>

pages/cidr.vue

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

pages/gameList.vue

@@ -0,0 +1,533 @@
+<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

@@ -44,16 +44,24 @@
 						</ElTooltip>
 					</div>
 					<ElTooltip content="请先停止自建服务和联机后再使用，否则内核被占用的情况下，无法进行内核更换">
-						<ElButton
-							class="ml-auto"
-							:disabled="data.isStart || listenObj.server_thread_id.value"
-							@click="handleCoreManagement"
-							:loading="data.update"
-							type="primary"
-							size="small"
+						<ElBadge
+							badge-class="!text-[9px] cursor-pointer"
+							:hidden="!haveNewCoreVersion"
+							:offset="[-5, 6]"
+							@click.stop="handleCoreManagement"
+							value="N"
 						>
-							内核管理
-						</ElButton>
+							<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>
 					</ElTooltip>
 				</div>
 			</template>
@@ -302,13 +310,19 @@
 								command="config_admin"
 								:icon="Platform"
 							>
-								配置管理
+								房间配置管理
 							</ElDropdownItem>
 							<ElDropdownItem
 								command="save_config_admin"
 								:icon="CirclePlusFilled"
 							>
-								保存当前配置
+								保存当前房间配置
+							</ElDropdownItem>
+							<ElDropdownItem
+								command="game_start_config"
+								:icon="SwitchFilled"
+							>
+								本地游戏列表
 							</ElDropdownItem>
 						</ElDropdownMenu>
 					</template>
@@ -393,7 +407,7 @@
 
 				<ElBadge
 					badge-class="!text-[9px] cursor-pointer"
-					:hidden="!data.hasNewVersion"
+					:hidden="!hasNewVersion"
 					:offset="[6, 7]"
 					value="N"
 				>
@@ -423,8 +437,11 @@
 	>
 		<div>
 			<ElText>当前版本: {{ data.coreVersion || "-" }}</ElText>
+			<div v-if="data.update">
+				<ElProgress :percentage="progress"></ElProgress>
+			</div>
 		</div>
-		<div class="mt-[10px] pb-[5px]">
+		<div class="mt-[5px] pb-[5px]">
 			<ElText class="!mr-[10px]">选择一个内核版本安装</ElText>
 			<ElButton
 				:loading="coreManagementData.loading"
@@ -467,7 +484,13 @@
 		<ElInput
 			v-model="mainStore.githubFastUrl"
 			placeholder="请输入github加速地址"
-		></ElInput>
+		>
+			<template #append>
+				<ElTooltip content="github加速链接的发布地址,当前地址失效后,访问它获取最新的地址">
+					<ElButton @click="open('https://ghproxy.link/')">发布地址</ElButton>
+				</ElTooltip>
+			</template>
+		</ElInput>
 		<template #footer>
 			<div class="text-right">
 				<ElButton
@@ -591,9 +614,9 @@
 		class="!mb-0"
 		v-model="configAdminData.visible"
 		:close-on-press-escape="false"
-		title="配置管理"
+		title="房间配置管理"
 	>
-		<div class="flex items-center gap-[0_4px]">
+		<div class="flex items-center">
 			<ElButton
 				@click="openConfigAdminDir"
 				size="small"
@@ -608,6 +631,20 @@
 			>
 				刷新
 			</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
@@ -621,15 +658,19 @@
 					:key="item.path"
 					:value="item.path"
 					:label="item.name"
-				>
-				</ElOption>
+				></ElOption>
 			</ElSelect>
 		</div>
 		<template #footer>
 			<div class="text-right">
 				<div class="mb-[5px]">
-					<ElAlert show-icon type="warning" title="打开目录删除文件即可删除配置"></ElAlert>
+					<ElAlert
+						show-icon
+						type="warning"
+						title="打开目录删除文件即可删除配置"
+					></ElAlert>
 				</div>
+
 				<ElButton
 					size="small"
 					@click="handleExchangeAdminConfig"
@@ -640,7 +681,7 @@
 				<ElButton
 					size="small"
 					@click="configAdminData.visible = false"
-					type="danger"
+					plain
 				>
 					关闭
 				</ElButton>
@@ -650,7 +691,7 @@
 </template>
 <script setup lang="ts">
 	import { invoke } from "@tauri-apps/api/core";
-	import { listen } from "@tauri-apps/api/event";
+	import { listen, type UnlistenFn } from "@tauri-apps/api/event";
 	import { open, Command } from "@tauri-apps/plugin-shell";
 	import {
 		QuestionFilled,
@@ -666,19 +707,20 @@
 		SetUp,
 		Folder,
 		CopyDocument,
-		Platform
+		Platform,
+		SwitchFilled
 	} from "@element-plus/icons-vue";
-	import { reactive, onBeforeUnmount, onMounted, ref, toRaw } from "vue";
-	import { useTray, setTrayRunState, setTrayTooltip, checkNewVersion } from "~/composables/tray";
+	import { reactive, onBeforeUnmount, onMounted, ref, toRaw, computed } from "vue";
+	import { useTray, setTrayRunState, setTrayTooltip, checkNewVersion, hasNewVersion } 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 from "@/composables/windows";
+	import etWindows, { dataSubscribe } from "@/composables/windows";
 	import { resourceDir as getResourceDir, join } from "@tauri-apps/api/path";
-	import { readDir, exists, mkdir, BaseDirectory, readTextFile, readFile, writeFile } from "@tauri-apps/plugin-fs";
+	import { readDir, exists, mkdir, BaseDirectory, readTextFile, readFile, writeFile, remove as removeFile } 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";
@@ -707,12 +749,12 @@
 	const config = mainStore.config;
 	// console.error(config);
 	const protocols = supportProtocols();
-	const data = reactive({
-		hasNewVersion: false, //easytierGame有没有新版
+	const data = reactive({ //easytierGame有没有新版
 		logVisible: false,
 		cidrVisible: false,
 		advanceVisible: false,
 		toolVisible: false,
+		gameListVisible: false,
 		serverVisible: false,
 		winipBcPid: 0, //WinIPBroadcast进程id
 		winipBcStart: false,
@@ -821,23 +863,11 @@
 		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),
@@ -922,24 +952,7 @@
 			});
 			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?.();
@@ -973,6 +986,18 @@
 		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("<>");
@@ -1004,14 +1029,20 @@
 
 	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();
@@ -1019,6 +1050,22 @@
 			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();
@@ -1043,6 +1090,7 @@
 	};
 
 	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;
@@ -1053,6 +1101,7 @@
 			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 });
 			}
@@ -1082,10 +1131,12 @@
 				try {
 					const decoder = new TextDecoder("utf-8");
 					const guiJsonStr = decoder.decode(guiJsonStrUint8);
-					const regex = /^(\s*\/\/.*)/gm;
-					const regex2 = /(,?)\s*\/\/.*(?=\n|$|\r\n)/gm;
-					const resultStr = guiJsonStr.replace(regex, "").replace(regex2, "$1");
-					const guiJson = JSON.parse(resultStr);
+					// 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);
 					let saveServerUrl = "";
 					if (guiJson.serverUrl) {
 						if (Array.isArray(guiJson.serverUrl)) {
@@ -1103,6 +1154,7 @@
 						config: {
 							...mainStore.config,
 							...guiJson,
+							customListenerData: guiJson?.customListenerData.join("\n") || "",
 							serverUrl: saveServerUrl
 						}
 					});
@@ -1119,14 +1171,6 @@
 				}
 			}
 		}
-		const b = bounce(600);
-		mainStore.$subscribe(async (...a) => {
-			if (mainStore.createConfigInEasytier) {
-				b(async () => {
-					await updateConfigJson(data.configJsonSeverUrl);
-				});
-			}
-		});
 	};
 
 	const initAutoStartServer = async () => {
@@ -1162,6 +1206,7 @@
 	let serverLogsTimer: NodeJS.Timeout | null = null;
 	let cidrTimer: NodeJS.Timeout | null = null;
 
+	const b = bounce(600);
 	onMounted(async () => {
 		await initGuiJson();
 		await compatibleInitAutoStart();
@@ -1170,7 +1215,6 @@
 		await getCoreVersion();
 		await listenObj.listenThreadId();
 		await listenObj.listenServerThreadId();
-		await listenObj.listenConfigStart();
 		await listenObj.listenStartStopServer();
 		await initConfigDir();
 		await initAutoStartServer();
@@ -1178,14 +1222,20 @@
 		initPreventSleep();
 		mountedShow(); // 不需要await
 		closePrevent();
-		data.hasNewVersion = await checkNewVersion();
+		dataSubscribe(async () => {
+			if (mainStore.createConfigInEasytier) {
+				b(async () => {
+					await updateConfigJson(data.configJsonSeverUrl);
+				});
+			}
+		});
+		getReleaseList();
+		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);
@@ -1318,6 +1368,12 @@
 		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;
 	};
 
@@ -1424,7 +1480,9 @@
 					disableUdpHolePunching,
 					relayAllPeerrpc,
 					compression,
-					enablePreventSleep
+					enablePreventSleep,
+					enableKcpProxy,
+					disableKcpInput
 				} = mainStore.config;
 				const WT = btoa(
 					encodeURIComponent(
@@ -1455,7 +1513,9 @@
 								disableUdpHolePunching,
 								relayAllPeerrpc,
 								compression,
-								enablePreventSleep
+								enablePreventSleep,
+								enableKcpProxy,
+								disableKcpInput
 							}
 						})
 					)
@@ -1510,6 +1570,8 @@
 					confirmButtonText: "保存",
 					cancelButtonText: "取消",
 					inputPlaceholder: "请输入2个字以上的存储名",
+					closeOnPressEscape: false,
+					closeOnClickModal: false,
 					inputValidator: (value: string) => {
 						const result = isValidWindowsFileName(value);
 						if (result) {
@@ -1551,6 +1613,47 @@
 				}
 			}
 		}
+
+		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 () => {

pages/member.vue

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

pages/server.vue

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

pages/tool.vue

@@ -42,7 +42,7 @@
 				</div>
 				<div>
 					<ElTooltip
-						content="使用ForceBindIP启动应用 (强制绑定IP或者网卡)，如果还有没启动联机，请先启动联机，联机成功后，点击刷新获取easytier生成的网卡"
+						content="使用ForceBindIP启动应用 (强制绑定IP或者网卡)，如果还没有启动联机，请先启动联机，联机成功后，点击刷新获取easytier生成的网卡"
 					>
 						<ElText>
 							方案2
@@ -477,19 +477,6 @@
 		}
 	};
 
-	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 : [];
@@ -505,5 +492,6 @@
 		data.pingIp = mainStore.config.ipv4;
 		initStartWinIpBroadcast();
 		getGuids();
+		dataSubscribe();
 	});
 </script>

src-tauri/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "easytier-game"
-version = "1.3.8"
+version = "1.4.2"
 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.5", features = [] }
+tauri-build = { version = "2.0.6", features = [] }
 # prost-build = "0.13.2"
 
 [dependencies]
 serde_json = "1.0.137"
 serde = { version = "1.0.217", features = ["derive"] }
-log = "0.4.25"
-tauri = { version = "2.2.3", features = [
+log = "0.4.26"
+tauri = { version = "2.3.0", features = [ "protocol-asset",
     "tray-icon",
     "image-png",
-    "image-ico",
-    "devtools"
+    "image-ico"
 ] }
 
-tauri-plugin-log = "2.2.0"
+tauri-plugin-log = "2.2.2"
 tauri-plugin-shell = "2.2.0"
 reqwest = { version = "0.12.12", features = ["json"] }
-zip = "2.2.2"
+zip = "2.2.3"
 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.0"
-rand = "0.8.5"
+tauri-plugin-clipboard-manager = "2.2.1"
+rand = "0.9.0"
 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_Power", "Win32_NetworkManagement_IpHelper", "Win32_NetworkManagement_Ndis", "Win32_Networking_WinSock"]
+features = ["Win32_System_TaskScheduler", "Win32_System_Com", "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.1"
+tauri-plugin-single-instance = "2.2.2"
 tauri-plugin-window-state = "2.2.1"

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"],
+	"windows": ["main", "log", "member", "cidr", "advance", "tool", "server", "gameList"],
 	"permissions": [
 		"core:default",
 		"core:window:allow-minimize",
@@ -88,11 +88,19 @@
 					"args": true,
 					"cmd": "ping",
 					"name": "ping"
+				},
+				{
+					"args": true,
+					"cmd": "powershell",
+					"name": "powershell"
 				}
 			]
 		},
 		"fs:default",
-		"fs:allow-read-dir",
+		{
+			"identifier": "fs:allow-read-dir",
+			"allow": [{ "path": "$DESKTOP" }, { "path": "$DESKTOP/*" }, { "path": "**/*" }, { "path": "**" }]
+		},
 		"fs:allow-exists",
 		"fs:allow-open",
 		"fs:allow-resource-read",

src-tauri/easytier/config_template.json

@@ -4,25 +4,37 @@
         "tcp",
         "udp"
     ], // 协议类型
-    
     // easytier服务地址 - 可填写多个 方式1，逗号分隔，"xxxx.cn,yyyy.com" 方式2,数组 ["xxxx.cn","yyyy.com"] （默认选中第一个）
     "serverUrl": "public.easytier.top:11010",
-    "networkName": "",  // 网络名
-    "networkPassword": "", // 网络密码
-    "hostname": "configTest", // 主机名
-    "ipv4": "10.126.126.1", // IP地址(选填，下面有dhcp)
-    "disableIpv6": false, // 禁用ipv6
-    "disbleListenner": true, // 禁用端口监听
+    "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, //    禁用监听
     "disableEncryption": false, // 禁用加密
+    "enablExitNode": false, // 启用出口节点
     "noTun": false, // 禁用tun
     "latencyfirst": false, // 延迟优先
-    "disableUdpHolePunching": false, // 禁用udp打洞
-    "disbleP2p": false,  // 禁用p2p, 强制中转
-    "dhcp": false,  // 动态分配IP
-    "devName": false, // 是否启用自定义网卡名
-    "devNameValue": "", // 网卡名(启用devName之后才生效)
-    "enableCustonProtocol": false,  // 是否启用自定义协议
-    "customProtocol": "tcp", // 自定义协议类型
-    "enableNetCardMetric": false,  // 自定义easytier每次生成的网卡跃点
-    "netCardMetricValue": 1 // 网卡跃点数量(1-9999)
+    "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输入
 }

src-tauri/src/lib.rs

@@ -3,6 +3,7 @@ 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};
@@ -91,13 +92,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::thread_rng();
-    let template = user_agents[rng.gen_range(0..user_agents.len())];
+    let mut rng = rand::rng();
+    let template = user_agents[rng.random_range(0..user_agents.len())];
 
     // 生成随机版本号
-    let version_major: u8 = rng.gen_range(70..90);
-    let version_minor: u8 = rng.gen_range(0..10);
-    let version_patch: u8 = rng.gen_range(0..10);
+    let version_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 = format!("{}.{}.{}", version_major, version_minor, version_patch);
 
     // 替换模板中的版本号占位符
@@ -325,7 +326,7 @@ async fn get_route_by_cli() -> String {
 }
 
 #[tauri::command(rename_all = "snake_case")]
-async fn download_easytier_zip(download_url: String, file_name: String) {
+async fn download_easytier_zip(app_handle: tauri::AppHandle ,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);
@@ -335,12 +336,12 @@ async fn download_easytier_zip(download_url: String, file_name: String) {
     }
 
     let target = format!("{}", download_url);
-    let response = reqwest::get(target)
+    let mut 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() {
@@ -354,11 +355,20 @@ async fn download_easytier_zip(download_url: String, file_name: String) {
         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
+            }
+        };
         
-    let content = response.bytes().await.expect("error to bytes easytier");
-    println!("下载完成，开始写入");
-    file.write_all(&content).expect("error to write easytier");
-    println!("写入完成");
+    }
+    println!("下载完成");
     unzip(path);
 
     let cache_dir_path = path::Path::new(&cache_dir_path);

src-tauri/tauri.conf.json

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

src-tauri/帮助.txt

@@ -8,12 +8,14 @@
 
 
 [如果想彻底删除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, // 是否自定义监听
-				customListenerV6Data: "udp://[::]:11010", //自定义ipv6监听
-				enableCustomListenerV6: true, // 是否自定义监听
+				enableCustomListenerV6: true, // 是否自定义IPV6监听
+				customListenerV6Data: "udp://[::]:11010", //自定义ipv6监
 				customListenerData: "tcp://0.0.0.0:11010\nudp://0.0.0.0:11010\ntcp://[::]:11010", // 自定义监听地址
 				disbleListenner: false, // 是否禁用监听
 				disableEncryption: false, // 是否禁用加密
@@ -39,6 +39,8 @@ const store = defineStore("main", {
 				netCardMetricValue: 1, //自定义网卡跃点值
 				enablePreventSleep: false, //组织系统休眠
 				compression: "none", //加密算法
+				enableKcpProxy: true, //启用kcp代理  默认开启
+				disableKcpInput: false //禁用kcp输入
 			},
 			serverConfig: {
 				enableWhiteList: true, // 是否启用白名单
@@ -49,13 +51,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://ghproxy.cc/",
+			githubFastUrl: "https://ghfast.top/",
 
 			// forceBindIp配置
 			forceBindIpBit: "64",
@@ -64,7 +66,10 @@ const store = defineStore("main", {
 			forceBindFile: "",
 
 			winipBcPid: 0,
-			winipBcStart: false
+			winipBcStart: false,
+			latestTagName: "",
+
+			gameList: [] as Array<{ name: string; exePath: string; id: string; coverImg?: string; showImg: string }> // 游戏列表
 		};
 	},
 	persist: {
@@ -109,6 +114,9 @@ const store = defineStore("main", {
 			"config.enablePreventSleep",
 			"config.compression",
 
+			"config.enableKcpProxy",
+			"config.disableKcpInput",
+
 			"serverConfig.autoStart",
 			// 'serverConfig.enableListener',
 			"serverConfig.enableWhiteList",
@@ -128,7 +136,10 @@ const store = defineStore("main", {
 			"forceBindIpBit",
 			"delayInjectDll",
 			"forceBindInput",
-			"forceBindFile"
+			"forceBindFile",
+			"latestTagName",
+			
+			"gameList"
 		]
 		// // 除了这些，其他都要存下来
 		// omit: ["winipBcPid", "winipBcStart"]

typings/index.d.ts

@@ -4,6 +4,7 @@ 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 {