更新readme 直接使用群号

README.md

@@ -28,7 +28,7 @@ Releases： [https://github.com/EasyTier/EasytierGame/releases](https://github.c
 - 如果还是无法满足您的需求，可以使用配置文件进行启动，具体如何配置，可以查看文档[配置文件](/guide/network/config-file.html)
     ![game-step5](/assets/game-step5.png)
 
-- easytier内核升级后，可以点击更新插件按钮就可以进行更新，但是需要出国，如果无法更新，可以在群里获取
+- easytier内核升级后，可以点击内核管理按钮就可以进行内核切换和更新，但是需要出国或者github加速链接，如果无法更新，可以在群里获取
     ![game-step6](/assets/game-step6.png)
 
 - 1.1.4更新了 配置分享功能 可以与朋友之间分享配置，方便联机
@@ -46,6 +46,9 @@ Releases： [https://github.com/EasyTier/EasytierGame/releases](https://github.c
 **解压zip后你可以查看 easytier/config_template.json 里的注释进行配置**
 ![game-step10](/assets/game-step10.png)
 
+- 1.2.3新增了帮助.txt 位于“easytier/帮助.txt" 内含 无法打开界面和卸载EasytierGame的办法，新增 "easytier/clear_local_data.bat" 用于清除easytierGame的本地缓存数据（需要管理员模式运行）
+![game-step11](/assets/game-step11.png)
+
 ## 特性
 
 - 基于easytier组网工具开发，界面清晰简单
@@ -59,6 +62,13 @@ Releases： [https://github.com/EasyTier/EasytierGame/releases](https://github.c
 
 支持Windows 11 、Windows 10 、 Windows 7
 
+## 群聊交流
+- 主群 EasyTier 支持 
+### 949700262
+
+- EasyTier游戏联机交流群
+### 596667137
+
 
 
 ## 请不要将本程序和仓库代码用于任何违法用途，由此产生的一切后果，仓库所有者和参与开发的人员不承担任何责任

app.vue

@@ -11,10 +11,20 @@
 		const original = console[fnName];
 		console[fnName] = (message) => {
 			original(message);
+			if (import.meta.env.PROD) {
+				try {
+					if (typeof message === "string") {
 						logger(message);
+					} else {
+						logger(JSON.stringify(message));
+					}
+				} catch (e) {
+					logger(`${message}`);
+				}
+			}
 		};
 	}
-	forwardConsole("log", trace);
+	forwardConsole("log", info);
 	forwardConsole("debug", debug);
 	forwardConsole("info", info);
 	forwardConsole("warn", warn);

assets/css/main.css

@@ -32,3 +32,8 @@ html.dark body {
 	box-sizing: border-box;
 	padding: 3px 5px;
 }
+
+.full-label .el-form-item__label {
+	width: 100%;
+	padding-right: 0;
+}

composables/tray.ts

@@ -17,7 +17,7 @@ async function toggleVisibility() {
 	}
 }
 
-export async function useTray(init: boolean = false, beforExit: Function) {
+export async function useTray(init: boolean = false, beforExit: Function, handleConnection: Function) {
 	let tray;
 	try {
 		tray = await TrayIcon.getById(DEFAULT_TRAY_NAME);
@@ -28,7 +28,7 @@ export async function useTray(init: boolean = false, beforExit: Function) {
 				id: DEFAULT_TRAY_NAME,
 				menu: await Menu.new({
 					id: "main",
-					items: await generateMenuItem(beforExit),
+					items: await generateMenuItem(beforExit, handleConnection),
 				}),
 				action: async (e) => {
 					toggleVisibility();
@@ -46,7 +46,7 @@ export async function useTray(init: boolean = false, beforExit: Function) {
 		tray.setMenu(
 			await Menu.new({
 				id: "main",
-				items: await generateMenuItem(beforExit),
+				items: await generateMenuItem(beforExit, handleConnection),
 			})
 		);
 	}
@@ -54,9 +54,10 @@ export async function useTray(init: boolean = false, beforExit: Function) {
 	return tray;
 }
 
-export async function generateMenuItem(beforExit: Function) {
+export async function generateMenuItem(beforExit: Function, handleConnection:Function) {
 	return [
 		await MenuItemShow("显示 / 隐藏"),
+		await MenuItemExchangeConnection("联机 / 断开", handleConnection),
 		await MenuItemTheme(),
 		await PredefinedMenuItem.new({ item: "Separator" }),
 		await MenuItemExit("退出", beforExit),
@@ -86,6 +87,17 @@ export async function MenuItemShow(text: string) {
 	});
 }
 
+export async function MenuItemExchangeConnection(text: string, handleConnection:Function) {
+	const menutItem =  await MenuItem.new({
+		id: "exchangeConnection",
+		text,
+		action: async () => {
+			const isStart = await handleConnection();
+		},
+	});
+	return menutItem;
+}
+
 export async function MenuItemTheme() {
 	return await MenuItem.new({
 		id: "theme",

package.json

@@ -3,7 +3,7 @@
 	"private": true,
 	"author": "leizi97",
 	"description": "A simple network initiator based on Easytier",
-	"version": "1.2.2",
+	"version": "1.2.4",
 	"scripts": {
 		"dev": "nuxt dev --dotenv env/.env.dev --host 0.0.0.0",
 		"build": "nuxt generate --dotenv env/.env.prod"

pages/advance.vue

@@ -76,7 +76,7 @@
 
 		<ElDivider />
 		<div><ElCheckbox v-model="mainStore.config.enablExitNode">允许此节点成为出口节点</ElCheckbox></div>
-		<div><ElCheckbox v-model="mainStore.config.disableEncryption">禁用对等节点通信的加密，默认为false，必须与对等节点相同</ElCheckbox></div>
+		<div><ElCheckbox v-model="mainStore.config.disableEncryption">禁用对等节点通信的加密，默认为启用，必须与对等节点相同</ElCheckbox></div>
 		<div><ElCheckbox v-model="mainStore.config.multiThread">使用多线程运行时，默认为单线程</ElCheckbox></div>
 		<ElDivider />
 

pages/index.vue

@@ -2,7 +2,8 @@
 	<ElForm
 		size="small"
 		label-position="top"
-		:model="config">
+		:model="config"
+	>
 		<!-- element-loading-custom-class="config-start"
 			v-loading="mainStore.configStartEnable"
 			:element-loading-spinner="'<path />'"
@@ -10,43 +11,58 @@
 		<!-- <div> -->
 		<ElFormItem
 			label="服务器"
-			prop="serverUrl">
+			prop="serverUrl"
+			class="full-label"
+		>
 			<template #label>
-				<div class="flex items-center gap-[0_5px]">
+				<div class="flex items-center flex-nowrap gap-[0_5px]">
 					<div>服务器</div>
 					<span>-</span>
 					<ElTag
 						effect="dark"
-						:type="data.isSuccessGetIp ? 'success' : 'info'">
+						:type="data.isSuccessGetIp ? 'success' : 'info'"
+					>
 						{{ data.isSuccessGetIp ? "联机成功" : data.isStart && !data.isSuccessGetIp ? "联机中" : "未联机" }}
 					</ElTag>
 					<ElButton
 						v-if="!data.coreVersion"
-						@click="getCoreVersion(true)">
+						@click="getCoreVersion(true)"
+					>
 						获取内核版本
 					</ElButton>
-					<ElTag
+					<div
 						v-else
-						type="info">
+						class="flex-1 truncate"
+					>
+						<ElTooltip :content="data.coreVersion">
+							<ElTag type="info">
 								{{ data.coreVersion }}
 							</ElTag>
-					<ElPopconfirm
+						</ElTooltip>
+					</div>
+
+					<!-- <ElPopconfirm
 						width="325"
 						cancel-button-text="取消"
 						confirm-button-text="继续"
 						title="内核从github下载，需要出国工具，可能下载缓慢或失败，是否继续?
 						也可以从官方群里手动下载后解压到easytier-game.exe同级目录下的easytier目录里,全部覆盖即可"
-						@confirm="handleUpdateCore">
+						@confirm="handleCoreManagement"
-						<template #reference>
+					>
+						<template #reference> -->
 					<ElButton
+						class="ml-auto"
 						:disabled="data.isStart"
+						@click="handleCoreManagement"
 						:loading="data.update"
-								type="warning"
+						type="primary"
-								size="small">
+						size="small"
-								{{ data.coreVersion ? "更新内核" : "下载内核" }}
+					>
+						内核管理
+						<!-- {{ data.coreVersion ? "更新内核" : "下载内核" }} -->
 					</ElButton>
-						</template>
+					<!-- </template>
-					</ElPopconfirm>
+					</ElPopconfirm> -->
 				</div>
 			</template>
 			<ElSelect
@@ -55,7 +71,8 @@
 				placeholder="请选择服务器地址"
 				default-first-option
 				v-model="config.serverUrl"
-				@change="handleServerUrlChange">
+				@change="handleServerUrlChange"
+			>
 				<template #prefix>
 					<div :class="config.protocol && config.protocol.length > 1 ? 'w-[120px]' : 'w-[80px]'">
 						<ElSelect
@@ -64,12 +81,14 @@
 							collapse-tags
 							@click.stop
 							v-model="config.protocol"
-							@change="handleServerUrlChange">
+							@change="handleServerUrlChange"
+						>
 							<ElOption
 								v-for="item in protocols"
 								:key="item"
 								:label="item"
-								:value="item"></ElOption>
+								:value="item"
+							></ElOption>
 						</ElSelect>
 					</div>
 				</template>
@@ -77,7 +96,8 @@
 					v-for="item in mainStore.basePeers"
 					:key="item"
 					:label="item"
-					:value="item">
+					:value="item"
+				>
 					<div class="flex items-center gap-[20px] overflow-hidden flex-nowrap max-w-[calc(100vw-62px)]">
 						<ElTooltip :content="item">
 							<p class="truncate">{{ item }}</p>
@@ -87,7 +107,8 @@
 								@click.stop="handleDeleteServerUrl(item)"
 								round
 								:icon="Delete"
-								type="danger"></ElButton>
+								type="danger"
+							></ElButton>
 						</div>
 					</div>
 				</ElOption>
@@ -107,7 +128,8 @@
 					<ElInput
 						maxlength="100"
 						placeholder="请输入网络名"
-						v-model="config.networkName"></ElInput>
+						v-model="config.networkName"
+					></ElInput>
 				</ElFormItem>
 			</div>
 			<div class="flex-1">
@@ -125,7 +147,8 @@
 						maxlength="100"
 						placeholder="请输入网络密码"
 						v-model="config.networkPassword"
-						type="password"></ElInput>
+						type="password"
+					></ElInput>
 				</ElFormItem>
 			</div>
 		</div>
@@ -142,11 +165,13 @@
 				<ElInput
 					maxlength="100"
 					placeholder="例如: Player1"
-					v-model="config.hostname"></ElInput>
+					v-model="config.hostname"
+				></ElInput>
 			</ElFormItem>
 			<ElFormItem
 				class="w-[70%]"
-				label="局域网IP">
+				label="局域网IP"
+			>
 				<template #label>
 					<div class="flex items-center h-[20px]">
 						虚拟网IP
@@ -159,14 +184,16 @@
 							inline-prompt
 							inactive-text="固定IP"
 							active-text="动态获取IP"
-							size="small"></ElSwitch>
+							size="small"
+						></ElSwitch>
 					</div>
 				</template>
 				<ElInput
 					maxlength="100"
 					:disabled="config.dhcp"
 					:placeholder="data.isStart && config.dhcp ? '等待动态分配IP...' : '例如: 10.126.126.1'"
-					v-model="config.ipv4"></ElInput>
+					v-model="config.ipv4"
+				></ElInput>
 			</ElFormItem>
 		</div>
 		<!-- </div> -->
@@ -180,24 +207,28 @@
 						size="default"
 						:type="!data.isStart ? 'primary' : 'danger'"
 						:disabled="data.startLoading || !data.coreVersion || data.update"
-						@click="handleConnection">
+						@click="handleConnection"
+					>
 						{{ !data.isStart ? "启动联机" : "停止联机" }}
 						<template #dropdown>
 							<ElDropdownMenu>
 								<ElDropdownItem
 									command="import_config"
-									:icon="Link">
+									:icon="Link"
+								>
 									导入配置
 								</ElDropdownItem>
 								<ElDropdownItem
 									command="share_config"
-									:icon="Share">
+									:icon="Share"
+								>
 									分享配置
 								</ElDropdownItem>
 								<ElDropdownItem
 									:icon="Tools"
 									command="toml"
-									:disabled="data.isStart">
+									:disabled="data.isStart"
+								>
 									使用外部配置文件
 								</ElDropdownItem>
 							</ElDropdownMenu>
@@ -207,51 +238,60 @@
 				<div class="mt-[6px] pl-[2px]">
 					<ElTooltip
 						placement="left"
-						content="日志">
+						content="日志"
+					>
 						<ElButton
 							:type="!data.logVisible ? 'info' : 'warning'"
 							@click="handleShowLogDialog"
 							:icon="List"
 							size="small"
-							plain></ElButton>
+							plain
+						></ElButton>
 					</ElTooltip>
 					<ElTooltip
 						placement="left"
-						content="成员">
+						content="成员"
+					>
 						<ElButton
 							@click="handleShowMemberDialog"
 							:icon="UserFilled"
 							plain
 							type="success"
-							size="small"></ElButton>
+							size="small"
+						></ElButton>
 					</ElTooltip>
 				</div>
 			</div>
 			<div class="ml-auto">
 				<ElCheckbox
 					v-model="config.disbleP2p"
-					size="small">
+					size="small"
+				>
 					强制中转
 				</ElCheckbox>
 				<ElTooltip
 					placement="top-start"
-					content="自启后隐藏于托盘，不显示界面">
+					content="自启后隐藏于托盘，不显示界面"
+				>
 					<ElCheckbox
 						@change="handleAutoStartByTask"
 						:model-value="config.autoStart"
-						size="small">
+						size="small"
+					>
 						开机自启
 					</ElCheckbox>
 				</ElTooltip>
 				<div>
 					<ElButton
 						@click="handleShowCidrDialog"
-						:icon="Share">
+						:icon="Share"
+					>
 						子网代理
 					</ElButton>
 					<ElButton
 						@click="handleShowAdvanceDialog"
-						:icon="Setting">
+						:icon="Setting"
+					>
 						高级选项
 					</ElButton>
 				</div>
@@ -262,7 +302,8 @@
 							type="primary"
 							size="small"
 							:icon="MagicStick"
-							@click="handleShowToolDialog">
+							@click="handleShowToolDialog"
+						>
 							增强工具
 						</ElButton>
 					</div>
@@ -270,13 +311,87 @@
 						class="!text-[9px] pb-[2px] ml-[8px] truncate"
 						type="info"
 						:underline="false"
-						@click="open('https://github.com/EasyTier/EasytierGame')">
+						@click="open('https://github.com/EasyTier/EasytierGame')"
+					>
 						EasytierGame主页
 					</ElLink>
 				</div>
 			</div>
 		</div>
 	</ElForm>
+	<ElDialog
+		width="95%"
+		top="10px"
+		append-to-body
+		:z-index="10"
+		class="!mb-0"
+		v-model="coreManagementData.visible"
+		:close-on-press-escape="false"
+		title="内核管理"
+	>
+		<div>
+			<ElText>当前版本: {{ data.coreVersion || "-" }}</ElText>
+		</div>
+		<div class="mt-[10px] pb-[5px]">
+			<ElText class="!mr-[10px]">选择一个内核版本安装</ElText>
+			<ElButton
+				:loading="coreManagementData.loading"
+				@click="getReleaseList"
+				size="small"
+			>
+				刷新
+			</ElButton>
+		</div>
+		<ElSelect
+			placeholder="请选择内核版本"
+			no-data-text="正在获取中..."
+			popper-class="!h-[120px]"
+			v-model="coreManagementData.data"
+		>
+			<ElOption
+				v-for="(release, idx) in data.releaseList"
+				:key="`${idx}-ray`"
+				:label="release[0]"
+				:value="`${release[2]}<>${release[1]}`"
+			>
+				{{ release ? release[0] : "" }}
+			</ElOption>
+		</ElSelect>
+		<div class="pb-[5px] mt-[10px]">
+			<ElTooltip content="不使用出国软件也能告诉下载github Release包的地址，可自行搜索替换使用">
+				<ElText>github下载加速地址</ElText>
+			</ElTooltip>
+		</div>
+		<ElInput
+			v-model="mainStore.githubFastUrl"
+			placeholder="请输入github加速地址"
+		></ElInput>
+		<template #footer>
+			<div class="text-right">
+				<ElButton
+					size="small"
+					:loading="data.update"
+					@click="handleInstallCore"
+					type="primary"
+				>
+					安装选中内核
+				</ElButton>
+				<ElButton
+					size="small"
+					type="warning"
+					@click="addQQGroup"
+				>
+					加群获取
+				</ElButton>
+				<ElButton
+					size="small"
+					@click="coreManagementData.visible = false"
+				>
+					取消
+				</ElButton>
+			</div>
+		</template>
+	</ElDialog>
 	<ElDialog
 		width="95%"
 		top="10px"
@@ -285,12 +400,14 @@
 		class="!mb-0"
 		v-model="importConfigData.visible"
 		:close-on-press-escape="false"
-		title="导入分享">
+		title="导入分享"
+	>
 		<ElInput
 			type="textarea"
 			:rows="6"
 			placeholder="请粘贴分享的配置"
-			v-model="importConfigData.data"></ElInput>
+			v-model="importConfigData.data"
+		></ElInput>
 		<template #footer>
 			<div>
 				<el-text type="danger">导入成功后，您当前的部分配置将被替换</el-text>
@@ -299,7 +416,8 @@
 				<ElButton
 					size="small"
 					@click="handleStartImport"
-					type="primary">
+					type="primary"
+				>
 					导入
 				</ElButton>
 			</div>
@@ -313,7 +431,8 @@
 		class="!mb-0"
 		v-model="configStart.visible"
 		:close-on-press-escape="false"
-		title="配置文件启动">
+		title="配置文件启动"
+	>
 		<div class="flex items-center gap-[0_4px]">
 			<span>启用</span>
 			<ElSwitch v-model="mainStore.configStartEnable"></ElSwitch>
@@ -322,14 +441,16 @@
 			</ElTooltip>
 			<ElButton
 				@click="openConfigDir"
-				size="small">
+				size="small"
+			>
 				打开配置目录
 			</ElButton>
 			<ElButton
 				@click="handleStartCommand('toml')"
 				type="primary"
 				:icon="RefreshRight"
-				size="small">
+				size="small"
+			>
 				刷新
 			</ElButton>
 		</div>
@@ -337,12 +458,14 @@
 			<ElSelect
 				v-model="mainStore.configPath"
 				no-data-text="目录没有配置文件"
-				placeholder="选择配置文件">
+				placeholder="选择配置文件"
+			>
 				<ElOption
 					v-for="item in configStart.list"
 					:key="item.path"
 					:value="item.path"
-					:label="item.name"></ElOption>
+					:label="item.name"
+				></ElOption>
 			</ElSelect>
 		</div>
 		<template #footer>
@@ -350,7 +473,8 @@
 				<ElButton
 					size="small"
 					@click="configStart.visible = false"
-					type="danger">
+					type="danger"
+				>
 					关闭
 				</ElButton>
 			</div>
@@ -376,7 +500,7 @@
 	import { updateConfigJson } from "~/composables/configJson";
 	import { writeText, readText } from "@tauri-apps/plugin-clipboard-manager";
 	import { sortedUniq, uniq } from "lodash-es";
-	import { bounce } from "~/utils";
+	import { bounce, addQQGroup } from "~/utils";
 
 	let is_close = false;
 
@@ -384,13 +508,16 @@
 		is_close = true;
 		await invoke("stop_command", { child_id: listenObj.thread_id || 0 });
 		await invoke("stop_command", { child_id: data.winipBcPid || 0 });
+	}, async () => {
+		await handleConnection();
+		return data.isStart
 	});
 
 	const mainStore = useMainStore();
 	const config = mainStore.config;
 	// console.error(config);
 	const protocols = ["tcp", "udp", "ws", "wss", "wg", "quic"];
-	const data = reactive({
+	const data = reactive<{ [key: string]: any; releaseList: Array<Array<string>> }>({
 		logVisible: false,
 		cidrVisible: false,
 		advanceVisible: false,
@@ -401,30 +528,36 @@
 		log: "",
 		update: false,
 		releaseList: [],
-		coreVersion: "",
+		coreVersion: "-",
 		isSuccessGetIp: false,
 		startLoading: false,
 		isStart: false,
 		connectionSuccess: false,
-		configJsonSeverUrl: "", // 本地保存一次，用于回填config.json
+		configJsonSeverUrl: "" // 本地保存一次，用于回填config.json
 	});
 
 	const configStart = reactive<{ list: Array<{ path: string; name: string }>; [key: string]: any }>({
 		visible: false,
 		loading: false,
-		list: [], //配置文件列表
+		list: [] //配置文件列表
 	});
 
 	const importConfigData = reactive<{ data: ""; [key: string]: any }>({
 		visible: false,
 		loading: false,
-		data: "",
+		data: ""
+	});
+
+	const coreManagementData = reactive<{ data: ""; [key: string]: any }>({
+		visible: false,
+		loading: false,
+		data: ""
 	});
 
 	const closePrevent = async () => {
 		const appWindow = getCurrentWindow();
 		if (appWindow.label == "main") {
-			appWindow.onCloseRequested(async (event) => {
+			appWindow.onCloseRequested(async event => {
 				// console.error(appWindow.label);
 				if (!is_close) {
 					// console.error(1);
@@ -472,7 +605,7 @@
 		thread_id: null,
 		async listenOutput() {
 			// const appWindow = getCurrentWindow();
-			const unListen = await listen("command-output", async (event) => {
+			const unListen = await listen("command-output", async event => {
 				data.isStart = true;
 				// console.error(event.payload);
 				if (event.payload) {
@@ -487,7 +620,7 @@
 							await setTrayTooltip(tray, `IP: ${ipv4}`);
 						}
 					} else {
-						if ((event.payload as string).includes("new peer connection added")) {
+						if ((event.payload as string).includes("new peer connection added") && !data.isSuccessGetIp) {
 							await setTrayRunState(tray, true);
 							data.isSuccessGetIp = true;
 							await setTrayTooltip(tray, `IP: ${config.ipv4}`);
@@ -505,7 +638,7 @@
 								"netsh",
 								["interface", "ipv4", "set", "interface", devName, "metric=", `${mainStore.config.netCardMetricValue}`],
 								{
-									encoding: "gb2312",
+									encoding: "gb2312"
 								}
 							).execute();
 						} catch (err) {
@@ -522,7 +655,7 @@
 			this.unListenOutPut = unListen;
 		},
 		async listenThreadId() {
-			const unListen = await listen("thread-id", (event) => {
+			const unListen = await listen("thread-id", event => {
 				if (event.payload) {
 					this.thread_id = event.payload;
 				}
@@ -530,14 +663,14 @@
 			this.unListenThreadId = unListen;
 		},
 		async listenConfigStart() {
-			const unListen = await listen("config", (event) => {
+			const unListen = await listen("config", event => {
-				console.error("config", event.payload);
+				// console.error("config", event.payload);
 				const ipv4 = config.ipv4;
 				mainStore.$patch(event.payload as any);
 				config.ipv4 = ipv4;
 			});
 			this.unListenConfigStart = unListen;
-		},
+		}
 	};
 
 	const unListenAll = async () => {
@@ -555,19 +688,23 @@
 	};
 
 	const checkUpdate = async () => {
-		await getReleaseList();
+		// const latestVersionFileName = data.releaseList?.[0]?.[0]?.[1] as string;
-		const latestVersionFileName = data.releaseList?.[0]?.[0]?.[1] as string;
+		let [downloadUrl, versionFileName] = (coreManagementData.data as string).split("<>");
-		if (latestVersionFileName) {
+		if (mainStore.githubFastUrl) {
+			let fastUrl = mainStore.githubFastUrl.replace(/\\/g, "/").replace(/\/{2,}/g, "/");
+			if (!fastUrl.endsWith("/")) fastUrl += "/";
+			downloadUrl = fastUrl + downloadUrl;
+		}
+		if (versionFileName) {
 			// console.error(latestVersionFileName, /\-v(\d+\.\d+\.\d+)/g.exec(latestVersionFileName));
-			const latestVersion = /\-v(\d+\.\d+\.\d+)/g.exec(latestVersionFileName)?.[1];
+			const version = /\-v(\d+\.\d+\.\d+)/g.exec(versionFileName)?.[1];
 			const currentVersion = /(\d+\.\d+\.\d+)/g.exec(data.coreVersion || "")?.[1];
-			if (latestVersion && currentVersion != latestVersion) {
+			if (version && currentVersion != version) {
 				// console.error({ currentVersion, latestVersion });
-				ElMessage.success(`更新 -> ${latestVersion}`);
+				ElMessage.success(`更新 -> ${version}`);
-				const downloadUrl = data.releaseList?.[0]?.[0]?.[2];
+				return [true, downloadUrl, versionFileName];
-				return [true, downloadUrl, latestVersionFileName];
+			} else if (currentVersion === version) {
-			} else if (currentVersion === latestVersion) {
+				ElMessage.success(`当前版本无需安装`);
-				ElMessage.success(`当前是最新版`);
 				return [false, null, null];
 			} else {
 				ElMessage.error(`获取版本失败`);
@@ -579,8 +716,16 @@
 		return [false, null, null];
 	};
 
-	const handleUpdateCore = async () => {
+	const handleCoreManagement = async () => {
+		coreManagementData.visible = true;
+		await getReleaseList();
+	};
+
+	const handleInstallCore = async () => {
 		try {
+			if (!coreManagementData.data) {
+				return ElMessage.error("请选择一个内核");
+			}
 			data.update = true;
 			await getCoreVersion();
 			const [isNeedUpdate, downloadUrl, latestVersionFileName] = await checkUpdate();
@@ -593,15 +738,22 @@
 			await getCoreVersion();
 		} catch (err) {
 			console.error(err);
-		}finally {
+		} finally {
 			data.update = false;
 		}
 	};
 
 	const getReleaseList = async () => {
-		const list = await invoke("fetch_easytier_list");
+		coreManagementData.loading = true;
-		data.releaseList = list as never[];
+		const list = await invoke<string[][][]>("fetch_easytier_list");
-		console.error(data.releaseList);
+		data.releaseList = [
+			...list.flat().filter(el => {
+				// console.log(el, el[0], el[2]);
+				return el && el[0] && el[2] && !el[2].includes("gui");
+			})
+		];
+		coreManagementData.loading = false;
+		// console.log(data.releaseList);
 	};
 
 	const handleAutoStart = async () => {
@@ -704,8 +856,8 @@
 						config: {
 							...mainStore.config,
 							...guiJson,
-							serverUrl: saveServerUrl,
+							serverUrl: saveServerUrl
-						},
+						}
 					});
 					if (mainStore.createConfigInEasytier) {
 						await updateConfigJson(data.configJsonSeverUrl);
@@ -715,7 +867,7 @@
 					ElMessage.error(`config.json格式错误`);
 				} finally {
 					mainStore.$patch({
-						createConfigInEasytier: true, // 发现本地存在config.json 默认启用该功能
+						createConfigInEasytier: true // 发现本地存在config.json 默认启用该功能
 					});
 				}
 			}
@@ -756,13 +908,31 @@
 	const getArgs = async () => {
 		// console.error(config.proxyNetworks);
 		const args = [];
-		if (mainStore.configStartEnable && mainStore.configPath) {
+		if (mainStore.configStartEnable) {
-			// const resourceDir = await getResourceDir();
+			if (mainStore.configPath) {
-			// const configPath = await join(resourceDir, mainStore.configPath);
+				const isExists = await exists(mainStore.configPath, { baseDir: BaseDirectory.Resource });
-			// args.push("-c", configPath);
+				if (isExists) {
-
+					const resourceDir = await getResourceDir();
-			args.push("-c", mainStore.configPath);
+					const configPath = await join(resourceDir, mainStore.configPath);
+					args.push("-c", configPath);
 					return args;
+				} else {
+					const appWindow = getCurrentWindow();
+					const isVisible = await appWindow.isVisible();
+					if (!isVisible) {
+						await appWindow.show();
+						await appWindow.setFocus();
+					}
+					mainStore.configPath = "";
+					ElMessage.error(`配置文件不存在 请重新选择`);
+					await handleStartCommand("toml"); // 配置文件不存在，显示配置文件弹窗
+					return [];
+				}
+			} else {
+				ElMessage.warning(`配置文件不存在 请选择`);
+				await handleStartCommand("toml"); // 配置文件不存在，显示配置文件弹窗
+				return [];
+			}
 		}
 		if (config.dhcp) {
 			args.push("-d");
@@ -781,7 +951,7 @@
 		}
 		if (config.serverUrl) {
 			const formatUrl = config.serverUrl.replace(/\\/g, "/");
-			args.push("--peers", ...config.protocol.map((protocol) => `${protocol}://${formatUrl}`));
+			args.push("--peers", ...config.protocol.map(protocol => `${protocol}://${formatUrl}`));
 		}
 		if (config.disbleP2p) {
 			args.push("--disable-p2p");
@@ -797,8 +967,8 @@
 			const reg = /\d+\.\d+\.\d+\.\d+\/\d+/g;
 			const formatProxyNetworks = config.proxyNetworks
 				.split("\n")
-				.map((item) => item.trim())
+				.map(item => item.trim())
-				.filter((item) => item && reg.test(item));
+				.filter(item => item && reg.test(item));
 			args.push("--proxy-networks", ...formatProxyNetworks);
 			config.proxyNetworks = formatProxyNetworks.join("\n");
 		}
@@ -842,7 +1012,7 @@
 			config.ipv4 = "";
 		}
 		const memberDialog = await getAllWebviewWindows();
-		const memberDialogs = memberDialog.filter((item) => item.label === "member");
+		const memberDialogs = memberDialog.filter(item => item.label === "member");
 		if (memberDialogs && memberDialogs.length > 0) {
 			data.memberVisible = false;
 			for (const memberDialog of memberDialogs) {
@@ -861,14 +1031,16 @@
 		if (data.isStart) {
 			await reset();
 		} else {
+			await setTrayTooltip(tray, "请求联机中...");
 			const args = await getArgs();
 			if (!args || args.length <= 0) {
-				return ElMessage.error("无配置");
+				await reset();
+				return;
 			}
 			if (args[0] === "-c") {
 				ElMessage.warning({
 					message: "使用配置文件中.",
-					duration: 5000,
+					duration: 5000
 				});
 			}
 			data.log = ""; //清空日志
@@ -877,7 +1049,7 @@
 			await listenObj.listenOutput();
 
 			await invoke("run_command", {
-				args,
+				args
 			});
 		}
 	};
@@ -891,10 +1063,10 @@
 			if (isExists) {
 				const entries = await readDir(path, { baseDir: BaseDirectory.Resource });
 				configStart.list = entries
-					.filter((item) => item.isFile)
+					.filter(item => item.isFile)
-					.map((item) => ({
+					.map(item => ({
 						name: item.name,
-						path: `${path}${item.name}`,
+						path: `${path}${item.name}`
 					})) as any;
 			} else {
 				mainStore.configStartEnable = false;
@@ -937,14 +1109,14 @@
 		try {
 			await ElMessageBox.confirm("确定导入?", "提示", {
 				confirmButtonText: "确定",
-				cancelButtonText: "取消",
+				cancelButtonText: "取消"
 			});
 			const payload = JSON.parse(decodeURIComponent(atob(importConfigData.data)));
 			mainStore.$patch({
 				config: {
 					...mainStore.config,
-					...payload.config,
+					...payload.config
-				},
+				}
 			});
 			ElMessage.success("导入成功");
 			importConfigData.visible = false;
@@ -992,7 +1164,7 @@
 				title: "成员列表",
 				width: 875,
 				height: 380,
-				url: "#/member",
+				url: "#/member"
 			},
 			() => {
 				data.memberVisible = true;
@@ -1011,7 +1183,7 @@
 				width: 600,
 				height: 380,
 				resizable: false,
-				url: "#/log",
+				url: "#/log"
 			},
 			(_, appWindow) => {
 				data.logVisible = true;
@@ -1034,7 +1206,7 @@
 				width: 600,
 				height: 380,
 				resizable: false,
-				url: "#/cidr",
+				url: "#/cidr"
 			},
 			(_, appWindow) => {
 				data.cidrVisible = true;
@@ -1053,7 +1225,7 @@
 				width: 600,
 				height: 380,
 				resizable: false,
-				url: "#/advance",
+				url: "#/advance"
 			},
 			(_, appWindow) => {
 				data.advanceVisible = true;
@@ -1072,7 +1244,7 @@
 				width: 460,
 				height: 480,
 				resizable: true,
-				url: "#/tool",
+				url: "#/tool"
 			},
 			(_, appWindow) => {
 				data.toolVisible = true;

src-tauri/Cargo.lock

@@ -1176,7 +1176,7 @@ checksum = "0d6ef0072f8a535281e4876be788938b528e9a1d43900b82c2569af7da799125"
 
 [[package]]
 name = "easytier-game"
-version = "1.2.2"
+version = "1.2.4"
 dependencies = [
  "log",
  "planif",

src-tauri/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "easytier-game"
-version = "1.2.2"
+version = "1.2.4"
 homepage = "https://github.com/EasyTier/EasyTier"
 repository = "https://github.com/EasyTier/EasytierGame"
 description = "A simple network initiator based on Easytier"

src-tauri/capabilities/default.json

@@ -15,6 +15,8 @@
     "core:window:allow-minimize",
     "core:window:allow-hide",
     "core:window:allow-close",
+    "core:window:allow-set-focus",
+    "core:window:allow-is-visible",
     "shell:allow-open",
     "core:window:allow-show",
     "core:window:allow-create",

src-tauri/easytier/clear_local_data.bat

@@ -0,0 +1,57 @@
+@echo off
+chcp 65001 >nul
+setlocal
+
+REM 检查是否具有管理员权限
+openfiles >nul 2>&1
+if %errorlevel% neq 0 (
+    echo 当前没有管理员权限，鼠标右键clear_data.bat，选择使用管理员模式运行...
+    pause
+    exit /b
+)
+
+REM 获取当前用户的 Local 目录路径
+set "local_dir=%LOCALAPPDATA%"
+
+REM 设置要删除的任务计划程序文件夹名称
+set "folder_name=\easytierGame"
+set "task_name=auto start"
+
+REM 设置要删除的目标文件夹
+set "target_data_dir=%local_dir%\com.tauri.easytier-game"
+echo ---
+REM 打印 Local 目录路径
+echo 当前数据目录: %target_data_dir%
+echo ---
+echo 您确定要清除EasytierGame的本地数据吗? (y/n)
+echo ---
+
+REM 等待用户输入
+set /p confirm=输入'y/n'进行确认:
+
+if /i "%confirm%"=="y" (
+    echo 清除数据中,请稍后...
+    echo ---
+    @REM REM 删除任务计划程序文件夹
+    echo delete auto_start task ...
+    echo ---
+
+    echo ---
+    schtasks /delete /tn "%folder_name%\%task_name%" /f
+    schtasks /delete /tn "%folder_name%" /f
+    echo ---
+    echo 开始清除本地缓存数据，没有使用开机自启上面就会报错，不影响数据清理...
+
+    if exist "%target_data_dir%" (
+        REM 删除目标文件夹及其内容
+        rd /s /q "%target_data_dir%"
+    )
+    echo 清除本地缓存数据完毕.
+    echo ---
+    echo 您可以手动删除EasytierGame目录下所有文件，即可完成卸载.
+) else (
+    echo 取消清理数据
+)
+
+pause
+endlocal

src-tauri/easytier/帮助.txt

@@ -0,0 +1,16 @@
+[如果界面无法打开]
+
+1. 如果您已经启动easytier-game.exe，那它可能会在后台运行，打开任务管理器关闭easytier-game.exe
+
+2. 使用easytier-game安装目录下的 easytier/tool/MicrosoftEdgeWebview2Setup.exe 安装webview2
+
+3. 再次启用easytier-game.exe
+
+
+[如果想彻底删除easytierGame]
+
+1. 关闭easytierGame
+
+2. 运行easytier-game安装目录下的 easytier/clear_local_data.bat (需要管理员权限) 输入y确认，清除本地存储数据
+
+3. 删除easytierGame文件夹

src-tauri/tauri.conf.json

@@ -1,7 +1,7 @@
 {
 	"$schema": "../node_modules/@tauri-apps/cli/config.schema.json",
 	"productName": "easytier-game",
-	"version": "1.2.2",
+	"version": "1.2.4",
 	"identifier": "com.tauri.easytier-game",
 
 	"build": {
@@ -13,7 +13,7 @@
 	"app": {
 		"windows": [
 			{
-				"title": "easytier-game 1.2.2",
+				"title": "easytier-game 1.2.4",
 				"label": "main",
 				"minWidth": 340,
 				"width": 340,
@@ -43,10 +43,13 @@
 			"easytier/icons/",
 			"easytier/config_template.json",
 			"easytier/tool/WinIPBroadcast.exe",
+			"easytier/tool/MicrosoftEdgeWebview2Setup.exe",
 			"easytier/easytier-cli.exe",
 			"easytier/easytier-core.exe",
 			"easytier/Packet.dll",
-			"easytier/wintun.dll"
+			"easytier/wintun.dll",
+			"easytier/clear_local_data.bat",
+			"easytier/帮助.txt"
 		],
 		"windows": {
 			"webviewInstallMode": {

stores/index.ts

@@ -38,6 +38,7 @@ export default defineStore("main", {
 			configPath: "", //配置文件路径
 			winIpBcAutoStart: true,
 			createConfigInEasytier: false, //在easytier目录生成config.json文件吗
+			githubFastUrl: "https://ghproxy.cc/",
 
 			winipBcPid: 0,
 			winipBcStart: false
@@ -80,7 +81,8 @@ export default defineStore("main", {
 			"configStartEnable",
 			"configPath",
 			"winIpBcAutoStart",
-			"createConfigInEasytier"
+			"createConfigInEasytier",
+			"githubFastUrl"
 		],
 		// // 除了这些，其他都要存下来
 		// omit: ["winipBcPid", "winipBcStart"]

utils/index.ts

@@ -1,6 +1,6 @@
+import { open } from "@tauri-apps/plugin-shell";
 export const ENV = import.meta.env;
 
-
 //防抖
 export const bounce = (time = 3000) => {
 	let bounceTimer: NodeJS.Timeout | null = null;
@@ -50,8 +50,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])
+		.then((data) => [null, data])
-		.catch(err => {
+		.catch((err) => {
 			if (errorExt) {
 				if (typeof errorExt !== "object") {
 					return [errorExt, undefined];
@@ -72,7 +72,7 @@ export const parsePeerInfo = (content: string) => {
 	const headers = lines[1]
 		.split("│")
 		.slice(1, -1)
-		.map(h => h.trim());
+		.map((h) => h.trim());
 
 	// 初始化结果数组
 	const result: any[] = [];
@@ -85,7 +85,7 @@ export const parsePeerInfo = (content: string) => {
 		const values = lines[i]
 			.split("│")
 			.slice(1, -1)
-			.map(v => v.trim());
+			.map((v) => v.trim());
 
 		// 创建对象并添加到结果数组
 		const obj: any = {};
@@ -100,6 +100,10 @@ export const parsePeerInfo = (content: string) => {
 	return result;
 };
 
+export const addQQGroup = () => {
+	open("https://qm.qq.com/q/Yo3HmaEIWC");
+};
+
 export function isValidIP(ip: string) {
 	const ipv4Pattern =
 		/^(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)$/;