增加内核管理判断

+ 升级vue -> 3.5.13
+ 升级nuxt -> 3.14.1592

README.md

@@ -29,6 +29,7 @@ Releases： [https://github.com/EasyTier/EasytierGame/releases](https://github.c
     ![game-step5](/assets/game-step5.png)
 
 - easytier内核升级后，可以点击内核管理按钮就可以进行内核切换和更新，但是需要出国或者github加速链接，如果无法更新，可以在群里获取
+- 1.2.6内核管理下载的内核 保存于easytier/cache目录，下次切换不用二次下载
     ![game-step6](/assets/game-step6.png)
 
 - 1.1.4更新了 配置分享功能 可以与朋友之间分享配置，方便联机
@@ -52,6 +53,9 @@ Releases： [https://github.com/EasyTier/EasytierGame/releases](https://github.c
 - 1.2.5新增 自建服务器功能，可以自行搭建服务器，但是需要一些网络知识，具体可以查看文档[自建服务器](https://www.easytier.top/guide/network/host-public-server.html)
 ![game-step12](/assets/game-step12.png)
 
+- 1.2.6重写 自建服务器功能，可以自行搭建服务器，但是需要一些网络知识，具体可以查看文档[自建服务器](https://www.easytier.top/guide/network/host-public-server.html),也可查看帮助.txt
+![game-step12](/assets/game-step12.png)
+
 ## 特性
 
 - 基于easytier组网工具开发，界面清晰简单

composables/server.ts

@@ -0,0 +1,25 @@
+import useMainStore from "@/stores/index";
+export const getServerArgs = () => {
+	const mainStore = useMainStore();
+	const args = [];
+	if (!mainStore.serverConfig.port) {
+		mainStore.serverConfig.port = "11010";
+	}
+	args.push("-l", mainStore.serverConfig.port);
+	if (mainStore.serverConfig.relayAllPeerrpc) {
+		args.push("--relay-all-peer-rpc");
+	}
+	const whiteList = mainStore.serverConfig.serverWhiteList
+		.trim()
+		.split("\n")
+		.map(el => el.trim())
+		.filter(el => el)
+		.join(" ");
+	if (whiteList && mainStore.serverConfig.enableWhiteList) {
+		args.push("--relay-network-whitelist", whiteList);
+	}
+	if (!whiteList && mainStore.serverConfig.enableWhiteList) {
+		args.push("--relay-network-whitelist");
+	}
+	return args;
+};

package.json

@@ -3,10 +3,11 @@
 	"private": true,
 	"author": "leizi97",
 	"description": "A simple network initiator based on Easytier",
-	"version": "1.2.5",
+	"version": "1.2.6",
 	"scripts": {
 		"dev": "nuxt dev --dotenv env/.env.dev --host 0.0.0.0",
-		"build": "nuxt generate --dotenv env/.env.prod"
+		"build": "nuxt generate --dotenv env/.env.prod",
+		"release": "node zip.js"
 	},
 	"devDependencies": {
 		"@element-plus/icons-vue": "^2.3.1",
@@ -26,10 +27,11 @@
 		"@types/lodash-es": "^4.17.12",
 		"@vitejs/plugin-vue-jsx": "^4.1.0",
 		"@vueuse/core": "^11.2.0",
+		"archiver": "^7.0.1",
 		"element-plus": "^2.8.7",
 		"less": "^4.2.0",
 		"lodash-es": "^4.17.21",
-		"nuxt": "^3.13.2",
+		"nuxt": "^3.14.1592",
 		"pinia": "^2.2.6",
 		"pinia-plugin-persistedstate": "^4.1.3",
 		"postcss": "^8.4.38",

pages/index.vue

@@ -1,6 +1,5 @@
 <template>
 	<ElForm
-		v-if="!mainStore.enableCreateServer"
 		size="small"
 		label-position="top"
 		:model="config"
@@ -36,16 +35,18 @@
 							</ElTag>
 						</ElTooltip>
 					</div>
-					<ElButton
-						class="ml-auto"
-						:disabled="data.isStart"
-						@click="handleCoreManagement"
-						:loading="data.update"
-						type="primary"
-						size="small"
-					>
-						内核管理
-					</ElButton>
+					<ElTooltip content="请先停止自建服务和联机后再使用，否则内核被占用的情况下，无法进行内核更换">
+						<ElButton
+							class="ml-auto"
+							:disabled="data.isStart || listenObj.server_thread_id.value"
+							@click="handleCoreManagement"
+							:loading="data.update"
+							type="primary"
+							size="small"
+						>
+							内核管理
+						</ElButton>
+					</ElTooltip>
 				</div>
 			</template>
 			<ElSelect
@@ -180,80 +181,6 @@
 			</ElFormItem>
 		</div>
 	</ElForm>
-	<ElForm
-		v-else
-		size="small"
-		label-position="top"
-		class="flex-1 overflow-hidden pb-[5px]"
-		:model="config"
-	>
-		<ElFormItem
-			label="白名单"
-			prop="ServerWhiteList"
-			class="full-label full-content overflow-hidden !flex flex-col h-full !mb-[0]"
-		>
-			<template #label>
-				<div class="flex items-center flex-nowrap gap-[0_5px]">
-					<div>白名单</div>
-					<span>-</span>
-					<ElTag
-						effect="dark"
-						:type="data.isStart ? 'success' : 'info'"
-					>
-						{{ data.isSuccessGetIp ? "运行成功" : data.isStart && !data.isSuccessGetIp ? "运行中" : "未启动" }}
-					</ElTag>
-					<ElButton
-						v-if="!data.coreVersion"
-						@click="getCoreVersion(true)"
-					>
-						获取内核版本
-					</ElButton>
-					<div
-						v-else
-						class="flex-1 truncate"
-					>
-						<ElTooltip :content="data.coreVersion">
-							<ElTag type="info">
-								{{ data.coreVersion }}
-							</ElTag>
-						</ElTooltip>
-					</div>
-					<ElButton
-						class="ml-auto"
-						:disabled="data.isStart"
-						@click="handleCoreManagement"
-						:loading="data.update"
-						type="primary"
-						size="small"
-					>
-						内核管理
-					</ElButton>
-				</div>
-			</template>
-			<div class="h-full w-full flex flex-col overflow-hidden">
-				<div class="flex-1 overflow-auto">
-					<ElInput
-						:disabled="!mainStore.enableWhiteList"
-						placeholder="一行一个，支持通配符列表，如（ab*）。当该参数的列表为空时，就不会为所有其他网络提供转发服务。"
-						:maxlength="1000"
-						v-model="mainStore.ServerWhiteList"
-						type="textarea"
-						:autosize="{
-							minRows: 9
-						}"
-						resize="none"
-					></ElInput>
-				</div>
-				<div class="text-center">
-					<ElCheckbox v-model="mainStore.enableWhiteList">启用白名单</ElCheckbox>
-					<ElCheckbox v-model="mainStore.config.relayAllPeerrpc">转发所有对等节点的RPC数据包</ElCheckbox>
-					<ElTooltip content="帮助其他虚拟网建立P2P链接">
-						<ElIcon><QuestionFilled /></ElIcon>
-					</ElTooltip>
-				</div>
-			</div>
-		</ElFormItem>
-	</ElForm>
 	<div class="flex items-start mt-auto">
 		<div>
 			<div>
@@ -266,15 +193,7 @@
 					:disabled="data.startLoading || !data.coreVersion || data.update"
 					@click="handleConnection"
 				>
-					{{
-						!data.isStart
-							? mainStore.enableCreateServer
-								? "启动服务"
-								: "启动联机"
-							: mainStore.enableCreateServer
-							? "停止服务"
-							: "停止联机"
-					}}
+					{{ !data.isStart ? "启动联机" : "停止联机" }}
 					<template #dropdown>
 						<ElDropdownMenu>
 							<ElDropdownItem
@@ -289,11 +208,14 @@
 							>
 								分享联机相关配置
 							</ElDropdownItem>
+							<ElDropdownItem disabled>
+								<ElDivider class="!h-[2px] !m-0" />
+							</ElDropdownItem>
 							<ElDropdownItem
 								:icon="SetUp"
 								command="create_server"
 							>
-								{{ mainStore.enableCreateServer ? "我要联机" : "我要开服(自建)" }}
+								自建服务({{ listenObj.server_thread_id.value ? "运行中" : "未运行" }})
 							</ElDropdownItem>
 							<ElDropdownItem
 								:icon="Tools"
@@ -558,7 +480,7 @@
 	import { listen } from "@tauri-apps/api/event";
 	import { open, Command } from "@tauri-apps/plugin-shell";
 	import { QuestionFilled, Delete, List, UserFilled, Setting, Share, RefreshRight, Link, Tools, MagicStick, SetUp } from "@element-plus/icons-vue";
-	import { reactive, onBeforeUnmount, onMounted } from "vue";
+	import { reactive, onBeforeUnmount, onMounted, ref } from "vue";
 	import { useTray, setTrayRunState, setTrayTooltip } from "~/composables/tray";
 	import { initStartWinIpBroadcast } from "~/composables/netcard";
 	import useMainStore from "@/stores/index";
@@ -573,6 +495,8 @@
 	import { writeText, readText } from "@tauri-apps/plugin-clipboard-manager";
 	import { sortedUniq, uniq } from "lodash-es";
 	import { bounce, addQQGroup } from "~/utils";
+	import { ElConfirmDanger, ElConfirmPrimary } from "~/utils/element";
+	import { getServerArgs } from "@/composables/server";
 
 	let is_close = false;
 
@@ -582,6 +506,7 @@
 			is_close = true;
 			await invoke("stop_command", { child_id: listenObj.thread_id || 0 });
 			await invoke("stop_command", { child_id: data.winipBcPid || 0 });
+			await invoke("stop_command", { child_id: listenObj.server_thread_id.value || 0 });
 		},
 		async () => {
 			await handleConnection();
@@ -592,16 +517,18 @@
 	const mainStore = useMainStore();
 	const config = mainStore.config;
 	// console.error(config);
-	const protocols = ["tcp", "udp", "ws", "wss", "wg", "quic"];
+	const protocols = ["tcp", "udp", "ws", "wss", "quic"];
 	const data = reactive<{ [key: string]: any; releaseList: Array<Array<string>> }>({
 		logVisible: false,
 		cidrVisible: false,
 		advanceVisible: false,
 		toolVisible: false,
+		serverVisible: false,
 		winipBcPid: 0, //WinIPBroadcast进程id
 		winipBcStart: false,
 		memberVisible: false,
 		log: "",
+		serverLog: "", //服务端日志
 		update: false,
 		releaseList: [],
 		coreVersion: "-",
@@ -677,17 +604,29 @@
 	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),
 		async listenOutput() {
 			// const appWindow = getCurrentWindow();
-			const unListen = await listen("command-output", async event => {
+			const unListen = await listen<string>("command-output", async event => {
 				data.isStart = true;
 				// console.error(event.payload);
 				if (event.payload) {
 					data.startLoading = false;
 					let ipv4 = /dhcp ip changed. old: None, new: Some\((\d+\.\d+\.\d+\.\d+).*\)/g.exec(event.payload as string)?.[1];
 					let devName = /tun device ready. dev: (.*)/g.exec(event.payload as string)?.[1];
+					if (event.payload.includes("peer connection removed")) {
+						data.isSuccessGetIp = false;
+					}
+					if (event.payload.includes("new peer connection added") && !data.isSuccessGetIp) {
+						await setTrayRunState(tray, true);
+						data.isSuccessGetIp = true;
+						await setTrayTooltip(tray, `IP: ${config.ipv4}`);
+					}
 					if (config.dhcp || mainStore.configStartEnable) {
 						if (ipv4) {
 							config.ipv4 = ipv4;
@@ -695,12 +634,6 @@
 							data.isSuccessGetIp = true;
 							await setTrayTooltip(tray, `IP: ${ipv4}`);
 						}
-					} else {
-						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}`);
-						}
 					}
 					if (
 						devName &&
@@ -738,6 +671,24 @@
 			});
 			this.unListenThreadId = unListen;
 		},
+		async listenServerOutPut() {
+			const unListen = await listen<string>("server-command-output", async event => {
+				// console.log("server-command-output", event);
+				const logArr = data.serverLog.split("\n");
+				const start = logArr.length > 1000 ? logArr.length - 1000 : 0;
+				data.serverLog = logArr.slice(start).join("\n");
+				data.serverLog += (event.payload || "") + "\n";
+			});
+			this.unListenServerOutPut = unListen;
+		},
+		async listenServerThreadId() {
+			const unListen = await listen("server-thread-id", event => {
+				if (event.payload) {
+					this.server_thread_id.value = event.payload;
+				}
+			});
+			this.unListenServerThreadId = unListen;
+		},
 		async listenConfigStart() {
 			const unListen = await listen("config", event => {
 				// console.error("config", event.payload);
@@ -746,6 +697,23 @@
 				config.ipv4 = ipv4;
 			});
 			this.unListenConfigStart = unListen;
+		},
+		async listenStartStopServer() {
+			const unListen = await listen<{ args: Array<string> }>("startStopServer", async event => {
+				await listenObj?.unListenServerOutPut?.();
+				await invoke("stop_command", { child_id: listenObj.server_thread_id.value || 0 });
+				if (listenObj.server_thread_id.value) {
+					listenObj.server_thread_id.value = null;
+				} else {
+					data.serverLog = "";
+					await listenObj.listenServerOutPut();
+					await invoke("run_command", {
+						args: event.payload.args,
+						is_server: true
+					});
+				}
+			});
+			this.unListenStartStopServer = unListen;
 		}
 	};
 
@@ -958,18 +926,35 @@
 		});
 	};
 
+	const initAutoStartServer = async () => {
+		if (mainStore.serverConfig.autoStart && data.coreVersion) {
+			const args = getServerArgs();
+			await listenObj?.unListenServerOutPut?.();
+			await invoke("stop_command", { child_id: listenObj.server_thread_id.value || 0 });
+			data.serverLog = "";
+			await listenObj.listenServerOutPut();
+			await invoke("run_command", {
+				args,
+				is_server: true
+			});
+		}
+	};
+
 	let logsTimer: NodeJS.Timeout | null = null;
+	let serverLogsTimer: NodeJS.Timeout | null = null;
 
 	onMounted(async () => {
-		// await handleUpdateCore();  //默认不自动更新
 		await initGuiJson();
 		await compatibleInitAutoStart();
 		// await initAutoStart();
 		await initStartWinIpBroadcast();
 		await getCoreVersion();
 		await listenObj.listenThreadId();
+		await listenObj.listenServerThreadId();
 		await listenObj.listenConfigStart();
+		await listenObj.listenStartStopServer();
 		await initConfigDir();
+		await initAutoStartServer();
 		await initConnectAfterStart();
 		closePrevent();
 	});
@@ -978,24 +963,14 @@
 		unListenAll();
 		listenObj.unListenReleaseList && listenObj.unListenReleaseList();
 		listenObj.unListenConfigStart && listenObj.unListenConfigStart();
+		listenObj.unListenStartStopServer && listenObj.unListenStartStopServer();
 		logsTimer && clearInterval(logsTimer);
+		serverLogsTimer && clearInterval(serverLogsTimer);
 	});
 
 	const getArgs = async () => {
 		// console.error(config.proxyNetworks);
 		const args = [];
-		if (mainStore.enableCreateServer) {
-			if (config.relayAllPeerrpc) {
-				args.push("--relay-all-peer-rpc");
-			}
-			const whiteList = mainStore.ServerWhiteList.trim().split("\n").map(el => el.trim()).filter(el => el).join(" ");
-			if(whiteList && mainStore.enableWhiteList) {
-				args.push("--relay-network-whitelist", whiteList);
-			}if(!whiteList && mainStore.enableWhiteList) {
-				args.push("--relay-network-whitelist");
-			}
-			return args
-		}
 		if (mainStore.configStartEnable) {
 			if (mainStore.configPath) {
 				const isExists = await exists(mainStore.configPath, { baseDir: BaseDirectory.Resource });
@@ -1022,6 +997,7 @@
 				return [];
 			}
 		}
+
 		if (config.dhcp) {
 			args.push("-d");
 		}
@@ -1192,25 +1168,32 @@
 			importConfigData.visible = true;
 		}
 		if (command === "create_server") {
-			mainStore.enableCreateServer = !mainStore.enableCreateServer;
-			if (mainStore.config.relayAllPeerrpc && !mainStore.enableCreateServer) {
-				try {
-					await ElMessageBox.confirm("是否关闭RPC流量转发?", "提示", {
-						confirmButtonText: "关闭",
-						cancelButtonText: "取消"
-					});
-					mainStore.config.relayAllPeerrpc = false;
-				} catch (err) {}
-			}
+			await handleShowServerDialog();
+			// if (data.isStart) {
+			// 	const [error] = await ElConfirmDanger("切换会停止{action}，是否继续?", "提示", {
+			// 		action: "`联机/服务`",
+			// 		confirmButtonText: "继续",
+			// 		cancelButtonText: "取消"
+			// 	});
+			// 	if (!error) await reset();
+			// }
+			// mainStore.enableCreateServer = !mainStore.enableCreateServer;
+			// if (mainStore.config.relayAllPeerrpc && !mainStore.enableCreateServer) {
+			// 	const [error] = await ElConfirmPrimary("是否关闭RPC流量转发?", "提示", {
+			// 		confirmButtonText: "关闭",
+			// 		cancelButtonText: "取消"
+			// 	});
+			// 	if (!error) mainStore.config.relayAllPeerrpc = false;
+			// }
 		}
 	};
 
 	const handleStartImport = async () => {
-		try {
-			await ElMessageBox.confirm("确定导入?", "提示", {
-				confirmButtonText: "确定",
-				cancelButtonText: "取消"
-			});
+		const [err] = await ElConfirmPrimary("确定导入?", "提示", {
+			confirmButtonText: "确定",
+			cancelButtonText: "取消"
+		});
+		if (!err) {
 			const payload = JSON.parse(decodeURIComponent(atob(importConfigData.data)));
 			mainStore.$patch({
 				config: {
@@ -1221,7 +1204,7 @@
 			ElMessage.success("导入成功");
 			importConfigData.visible = false;
 			mainStore.basePeers = uniq([config.serverUrl, ...mainStore.basePeers]);
-		} catch (err) {
+		} else {
 			console.error(err);
 			if (err !== "cancel") {
 				ElMessage.error("导入失败");
@@ -1293,6 +1276,7 @@
 				}, 650);
 			},
 			() => {
+				logsTimer && clearInterval(logsTimer);
 				data.logVisible = false;
 			}
 		);
@@ -1354,4 +1338,30 @@
 			}
 		);
 	};
+
+	const handleShowServerDialog = async () => {
+		await etWindows(
+			"server",
+			{
+				title: "自建服务器",
+				minWidth: 550,
+				minHeight: 460,
+				width: 550,
+				height: 460,
+				resizable: true,
+				url: "#/server"
+			},
+			(_, appWindow) => {
+				data.serverVisible = true;
+				serverLogsTimer && clearInterval(serverLogsTimer);
+				serverLogsTimer = setInterval(() => {
+					appWindow.emitTo("server", "server_logs", { log: data.serverLog, threadId: listenObj.server_thread_id.value });
+				}, 650);
+			},
+			() => {
+				serverLogsTimer && clearInterval(serverLogsTimer);
+				data.serverVisible = false;
+			}
+		);
+	};
 </script>

pages/member.vue

@@ -79,7 +79,9 @@
 <script setup lang="ts">
 	import { invoke } from "@tauri-apps/api/core";
 	import { reactive, onMounted, onBeforeUnmount } from "vue";
-	import { parsePeerInfo } from "@/utils";
+	import { ATJ, parsePeerInfo } from "@/utils";
+	import { ElConfirmDanger } from "~/utils/element";
+import { getCurrentWindow } from "@tauri-apps/api/window";
 	// 	enum NatType {
 	//   // has NAT; but own a single public IP, port is not changed
 	//   Unknown = 0;
@@ -122,8 +124,30 @@
 		["tunnel_proto", "隧道协议"]
 	];
 
+	let timer: NodeJS.Timeout | null = null;
+
 	const listenOutput = async () => {
-		const member = await invoke<string>("get_members_by_cli");
+		const [error, member] = await ATJ(invoke<string>("get_members_by_cli"));
+		// if(!member) return;
+		if (error) {
+			data.member = [];
+			return "";
+		}
+		if (member === "_EasytierGameCliFailedToConnect_") {
+			stopTimer();
+			const [error] = await ElConfirmDanger("连接已断开,是否重新尝试?", "警告", {
+				confirmButtonText: "重试",
+				cancelButtonText: "关闭窗口"
+			});
+			if (!error) {
+				await listenOutput();
+			} else {
+				const appWindow = getCurrentWindow();
+				await appWindow.close();
+			}
+			data.member = [];
+			return;
+		}
 		const peerInfo = parsePeerInfo(member);
 		peerInfo.forEach(value => {
 			if (value.cost === "Local") {
@@ -133,20 +157,28 @@
 				value.ipv4 = value.ipv4.split("/")[0];
 			}
 		});
-		console.error(peerInfo);
 		data.member = peerInfo;
+		startTimer();
 	};
 
-	let timer: NodeJS.Timeout | null = null;
+	const startTimer = async () => {
+		timer && clearTimeout(timer);
+		timer = setTimeout(async () => {
+			await listenOutput();
+		}, 1000);
+	};
+
+	const stopTimer = () => {
+		timer && clearTimeout(timer);
+		timer = null;
+	}
 
 	onMounted(async () => {
-		listenOutput();
-		timer = setInterval(() => {
-			listenOutput();
-		}, 1000 * 10);
+		await listenOutput();
+		await startTimer();
 	});
 
 	onBeforeUnmount(() => {
-		timer && clearInterval(timer);
+		stopTimer();
 	});
 </script>

pages/server.vue

@@ -0,0 +1,128 @@
+<template>
+	<div class="flex flex-col gap-[10px] h-full">
+		<ElForm
+			size="small"
+			label-position="top"
+			:model="mainStore.serverConfig"
+		>
+			<ElFormItem
+				label="白名单"
+				prop="ServerWhiteList"
+				class="full-label full-content overflow-hidden !flex flex-col h-full !mb-[0]"
+			>
+				<template #label>
+					<div class="flex items-center gap-[10px]">
+						白名单
+						<ElSwitch
+							v-model="mainStore.serverConfig.enableWhiteList"
+							inline-prompt
+							active-text="启用"
+							inactive-text="禁用"
+						></ElSwitch>
+
+						<div class="ml-auto">
+							<ElTooltip
+								placement="top"
+								content="打开软件的时候，就会开启这个自建服务"
+							>
+								<ElCheckbox v-model="mainStore.serverConfig.autoStart">自动启动</ElCheckbox>
+							</ElTooltip>
+							<ElTooltip
+								placement="top"
+								content="帮助其他虚拟网建立P2P链接"
+							>
+								<ElCheckbox v-model="mainStore.serverConfig.relayAllPeerrpc">转发所有对等节点的RPC数据包</ElCheckbox>
+							</ElTooltip>
+						</div>
+					</div>
+				</template>
+				<div class="h-full w-full flex flex-col overflow-hidden">
+					<div class="flex-1 overflow-auto">
+						<ElInput
+							:disabled="!mainStore.serverConfig.enableWhiteList"
+							placeholder="一行一个，支持通配符列表，如（ab*）。当该参数的列表为空时，就不会为所有其他网络提供转发服务。"
+							:maxlength="1000"
+							v-model="mainStore.serverConfig.serverWhiteList"
+							type="textarea"
+							:rows="3"
+							resize="none"
+						></ElInput>
+					</div>
+				</div>
+			</ElFormItem>
+		</ElForm>
+		<div class="flex items-center gap-[10px]">
+			<div class="flex items-center gap-[5px]">
+				<ElText>服务器端口</ElText>
+				<div class="max-w-[100px]">
+					<ElTooltip content="端口号">
+						<ElInput v-model="mainStore.serverConfig.port"></ElInput>
+					</ElTooltip>
+				</div>
+			</div>
+			<ElButton
+				size="large"
+				:loading="data.loading"
+				:type="data.isStart ? 'danger' : 'primary'"
+				@click="hanldeClickStart"
+			>
+				{{ !data.isStart ? "启动服务器" : "停止服务器" }}
+			</ElButton>
+		</div>
+
+		<ElInput
+			placeholder="服务器日志"
+			:model-value="data.log"
+			type="textarea"
+			:rows="14"
+			resize="none"
+		></ElInput>
+	</div>
+</template>
+<script setup lang="ts">
+	import useMainStore from "@/stores/index";
+	import { reactive, onMounted, onBeforeUnmount } from "vue";
+	import { getCurrentWindow } from "@tauri-apps/api/window";
+	import { listen, type UnlistenFn } from "@tauri-apps/api/event";
+	import { getServerArgs } from "@/composables/server";
+
+    const appWindow = getCurrentWindow();
+	const mainStore = useMainStore();
+	const data = reactive({
+		log: "",
+		isStart: false,
+		loading: true
+	});
+
+	const listenStart = async () => {
+		const unListen = await listen<{ log: string; threadId: number | null }>("server_logs", event => {
+			data.log = event.payload.log || "";
+			if (event.payload.threadId) {
+				data.isStart = true;
+			} else {
+				data.isStart = false;
+			}
+			data.loading = false;
+		});
+		return unListen;
+	};
+
+	let unlistenStart: UnlistenFn | null = null;
+	onMounted(async () => {
+		unlistenStart = await listenStart();
+	});
+
+	onBeforeUnmount(() => {
+		unlistenStart && unlistenStart();
+	});
+
+	const hanldeClickStart = async () => {
+		data.loading = true;
+        const args = getServerArgs();
+		await appWindow.emitTo("main", "startStopServer", { args });
+	};
+
+    mainStore.$subscribe(async (...a) => {
+		await appWindow.emitTo("main", "config", { serverConfig: { ...mainStore.serverConfig }});
+	});
+</script>

src-tauri/Cargo.lock

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

src-tauri/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "easytier-game"
-version = "1.2.5"
+version = "1.2.6"
 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

@@ -8,7 +8,8 @@
     "member",
     "cidr",
     "advance",
-    "tool"
+    "tool",
+    "server"
   ],
   "permissions": [
     "core:default",

src-tauri/src/lib.rs

@@ -9,10 +9,7 @@ use std::fs::{self, File};
 use std::io::{BufRead, BufReader, Write};
 use std::os::windows::process::CommandExt;
 use std::process::{Command, Stdio};
-use std::sync::{
-    atomic::{AtomicBool, Ordering},
-    mpsc, Arc,
-};
+use std::sync::mpsc;
 use std::{path, thread};
 use sysinfo::System;
 use tauri::tray::{MouseButton, MouseButtonState, TrayIconBuilder, TrayIconEvent};
@@ -142,15 +139,32 @@ fn get_members_by_cli() -> String {
         .output()
     {
         Ok(output) => {
-            let output_str = String::from_utf8_lossy(&output.stdout);
-            return output_str.trim().to_string();
+            if output.status.success() {
+                let output_str = String::from_utf8_lossy(&output.stdout);
+                return output_str.trim().to_string();
+            }else {
+                let output_str = String::from_utf8_lossy(&output.stderr);
+                log::error!("{}", output_str.trim().to_string());
+                return "_EasytierGameCliFailedToConnect_".to_string();
+            }
         }
-        Err(_e) => return _e.to_string(),
+        Err(_e) => {
+            log::error!("get member list error");
+            return "".to_string();
+        },
     }
 }
 
 #[tauri::command(rename_all = "snake_case")]
 async fn download_easytier_zip(download_url: String, file_name: String) {
+    let cache_dir_path = get_tool_exe_path(String::from("\\easytier\\cache"));
+    let cache_file_name = format!("{}\\{}", cache_dir_path, file_name);
+    let cache_file_name_path = path::Path::new(&cache_file_name);
+    if cache_file_name_path.exists() {
+        unzip(cache_file_name_path);
+        return;
+    }
+
     let target = format!("{}", download_url);
     let response = reqwest::get(target)
         .await
@@ -177,10 +191,19 @@ async fn download_easytier_zip(download_url: String, file_name: String) {
     file.write_all(&content).expect("error to write easytier");
     println!("写入完成");
     unzip(path);
-    match fs::remove_file(path) {
-        Ok(_) => println!("删除zip文件成功"),
-        Err(_) => log::error!("删除zip文件失败"),
+
+    let cache_dir_path = path::Path::new(&cache_dir_path);
+    if !cache_dir_path.exists() {
+        fs::create_dir_all(&cache_dir_path).unwrap();
     }
+    match fs::rename(path, cache_file_name) {
+        Ok(_) => println!("保存zip文件至easytier/cache成功"),
+        Err(_) => log::error!("保存zip文件失败"),
+    }
+    // match fs::remove_file(path) {
+    //     Ok(_) => println!("删除zip文件成功"),
+    //     Err(_) => log::error!("删除zip文件失败"),
+    // }
 }
 
 fn unzip(fname: &path::Path) {
@@ -228,18 +251,22 @@ fn unzip(fname: &path::Path) {
 }
 
 #[tauri::command(rename_all = "snake_case")]
-fn run_command(
-    app_handle: tauri::AppHandle,
-    args: Vec<String>,
-    stop_signal: tauri::State<Arc<AtomicBool>>,
-) {
+fn run_command(app_handle: tauri::AppHandle, args: Vec<String>, is_server: Option<bool>) {
+    let is_server = is_server.unwrap_or(false);
     let (tx, rx) = mpsc::channel();
-    stop_signal.store(false, Ordering::Relaxed);
+
     let app_handle1 = app_handle.clone();
     let app_handle2 = app_handle.clone();
-    let stop_signal1 = Arc::clone(&stop_signal);
-    let stop_signal2 = Arc::clone(&stop_signal);
+
     let args2 = args.clone();
+    let mut thread_id_str = "thread-id";
+    if is_server {
+        thread_id_str = "server-thread-id";
+    }
+    let mut command_output_str = "command-output";
+    if is_server {
+        command_output_str = "server-command-output";
+    }
     thread::spawn(move || {
         let core_path = get_tool_exe_path(String::from("\\easytier\\easytier-core.exe"));
         // trace, debug, info, warn, error, off
@@ -252,36 +279,36 @@ fn run_command(
 
         println!("child id: {}", child.id());
         app_handle1
-            .emit("thread-id", child.id())
+            .emit(thread_id_str, child.id())
             .expect("failed to emit id event");
         app_handle1
-            .emit("command-output", args2.join(" "))
+            .emit(command_output_str, args2.join(" "))
             .expect("error output args");
         let stdout = child.stdout.take().expect("failed to capture stdout");
         let reader = BufReader::new(stdout);
 
         for line in reader.lines() {
             match line {
-                Ok(line) => {
-                    tx.send(line).expect("failed to send line");
-                }
+                Ok(line) => match tx.send(line) {
+                    Ok(_) => {}
+                    Err(e) => {
+                        log::error!("error sending line: {}", e);
+                        break;
+                    }
+                },
                 Err(e) => {
                     log::error!("error reading line: {}", e);
                     break;
                 }
             }
         }
-        stop_signal1.store(true, Ordering::Relaxed);
         println!("end");
     });
 
     thread::spawn(move || {
         while let Ok(line) = rx.recv() {
-            if stop_signal2.load(Ordering::Relaxed) {
-                break;
-            }
             app_handle2
-                .emit("command-output", line)
+                .emit(command_output_str, line)
                 .expect("failed to emit event");
         }
     });
@@ -523,8 +550,6 @@ pub fn run() {
     // 获取命令行参数
     let args: Vec<String> = std::env::args().collect();
 
-    let stop_signal = Arc::new(AtomicBool::new(false)); // 创建一个原子布尔值，用于控制命令的停止
-    let stop_signal_clone = Arc::clone(&stop_signal); // 创建一个原子布尔值的克隆，用于传递给命令
     let context = tauri::generate_context!();
     tauri::Builder::default()
         .plugin(
@@ -592,7 +617,6 @@ pub fn run() {
 
             Ok(())
         })
-        .manage(stop_signal_clone)
         .invoke_handler(tauri::generate_handler![
             run_command,
             stop_command,

src-tauri/tauri.conf.json

@@ -1,7 +1,7 @@
 {
 	"$schema": "../node_modules/@tauri-apps/cli/config.schema.json",
 	"productName": "easytier-game",
-	"version": "1.2.5",
+	"version": "1.2.6",
 	"identifier": "com.tauri.easytier-game",
 
 	"build": {
@@ -13,7 +13,7 @@
 	"app": {
 		"windows": [
 			{
-				"title": "easytier-game 1.2.5",
+				"title": "easytier-game 1.2.6",
 				"label": "main",
 				"minWidth": 340,
 				"width": 340,
@@ -49,7 +49,7 @@
 			"easytier/Packet.dll",
 			"easytier/wintun.dll",
 			"easytier/clear_local_data.bat",
-			"easytier/帮助.txt"
+			"帮助.txt"
 		],
 		"windows": {
 			"webviewInstallMode": {

src-tauri/帮助.txt

@@ -13,4 +13,12 @@
 
 2. 运行easytier-game安装目录下的 easytier/clear_local_data.bat (需要管理员权限) 输入y确认，清除本地存储数据
 
-3. 删除easytierGame文件夹
+3. 删除easytierGame文件夹
+
+
+[没有服务器，怎么自建服务]
+1. 点击 启动联机 按钮旁边的箭头 选择自建服务 设置好端口号后 点击启动服务器
+
+2. 搜索一下 openFrp mossFrp sakurafrp 等 将你的本地服务通过它（们）代理到公网
+
+3. 将代理之后的地址发给别人，他们就可以通过这个加入你的服务了

stores/index.ts

@@ -31,6 +31,14 @@ export default defineStore("main", {
 				enableNetCardMetric: false, //启用网卡自定义跃点
 				netCardMetricValue: 1 //自定义网卡跃点值
 			},
+			serverConfig: {
+				enableWhiteList: true, // 是否启用白名单
+				relayAllPeerrpc: false, // 是否启用所有对等RPC
+				serverWhiteList: "", // 服务器流量转发白名单
+				// enableListener: true, // 是否启用监听
+				autoStart: false, //随软件自启
+				port: "11010", // 服务器端口
+			},
 			cidrEnable: false,
 			basePeers: ["public.easytier.top:11010"],
 			theme: false, //主题  false light true dark
@@ -39,9 +47,7 @@ export default defineStore("main", {
 			winIpBcAutoStart: true,
 			createConfigInEasytier: false, //在easytier目录生成config.json文件吗
 			githubFastUrl: "https://ghproxy.cc/",
-			enableCreateServer: false, // 自建服务器
-			enableWhiteList: true, // 是否启用白名单
-			ServerWhiteList: "", // 服务器流量转发白名单
+
 
 			winipBcPid: 0,
 			winipBcStart: false
@@ -78,6 +84,14 @@ export default defineStore("main", {
 			"config.enableNetCardMetric",
 			"config.netCardMetricValue",
 
+			"serverConfig.autoStart",
+			// 'serverConfig.enableListener',
+			'serverConfig.enableWhiteList',
+			'serverConfig.relayAllPeerrpc',
+			'serverConfig.serverWhiteList',
+			'serverConfig.port',
+
+
 			"cidrEnable",
 			"basePeers",
 			"theme",
@@ -86,10 +100,6 @@ export default defineStore("main", {
 			"winIpBcAutoStart",
 			"createConfigInEasytier",
 			"githubFastUrl",
-
-			"enableCreateServer",
-			"enableWhiteList",
-			"ServerWhiteList"
 		],
 		// // 除了这些，其他都要存下来
 		// omit: ["winipBcPid", "winipBcStart"]

utils/index.ts

@@ -65,6 +65,7 @@ export const ATJ = (promise: Promise<any>, errorExt: string | undefined = undefi
 };
 
 export const parsePeerInfo = (content: string) => {
+	if(!content) return [];
 	// 将表格字符串分割成行
 	const lines = content.split("\n");
 

zip.js

@@ -0,0 +1,66 @@
+/**
+ * 生成 release 发布包 zip 文件
+ */
+
+const releaseDir = "./src-tauri/target/release";
+const releaseDirEasytier = `${releaseDir}/easytier/`;
+const releaseExe = `${releaseDir}/easytier-game.exe`;
+const releaseHelp = `${releaseDir}/帮助.txt`;
+const deleteEasytierFiles = ["logs/", "guiLogs/", "cache/"];
+const pkg = require("./package.json");
+const fileName = `easytier-game_windows_x86_64_${pkg.version}.zip`; // 发布包格式
+const releaseZipDir = "./release";
+const releaseZip = `${releaseZipDir}/${fileName}`;
+
+const fs = require("fs");
+const path = require("path");
+const archiver = require("archiver");
+
+const output = fs.createWriteStream(path.join(__dirname, releaseZip));
+const archive = archiver("zip", {
+	zlib: { level: 8 } // Sets the compression level.
+});
+
+// listen for all archive data to be written
+// 'close' event is fired only when a file descriptor is involved
+output.on("close", function () {
+	console.log(archive.pointer() + " total bytes");
+	console.log(`archiver has been finalized and the output ${releaseZip}`);
+});
+
+// This event is fired when the data source is drained no matter what was the data source.
+// It is not part of this library but rather from the NodeJS Stream API.
+// @see: https://nodejs.org/api/stream.html#stream_event_end
+output.on("end", function () {
+	console.log("Data has been drained");
+});
+
+// good practice to catch warnings (ie stat failures and other non-blocking errors)
+archive.on("warning", function (err) {
+	if (err.code === "ENOENT") {
+		// log warning
+	} else {
+		// throw error
+		throw err;
+	}
+});
+
+archive.on("error", function (err) {
+	throw err;
+});
+
+for (const f of deleteEasytierFiles) {
+	fs.rmSync(path.join(__dirname, releaseDirEasytier + f), { recursive: true, force: true });
+}
+const r = path.join(__dirname, releaseZipDir);
+if (!fs.existsSync(r)) {
+	fs.mkdirSync(r);
+}
+
+// pipe archive data to the file
+archive.pipe(output);
+archive
+	.append(fs.createReadStream(path.join(__dirname, releaseExe)), { name: "easytier-game.exe" })
+	.append(fs.createReadStream(path.join(__dirname, releaseHelp)), { name: "帮助.txt" })
+	.directory(path.join(__dirname, releaseDirEasytier), "easytier")
+	.finalize();