From 5fc931f94ed02d9fa68aae6d06e2563cf856eada Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=BB=91=E5=85=88=E6=A3=AE?= <leizi97@126.com>
Date: Tue, 26 Nov 2024 18:17:19 +0800
Subject: [PATCH] =?UTF-8?q?=E8=87=AA=E5=BB=BA=E6=9C=8D=E5=8A=A1=E5=99=A8?=
 =?UTF-8?q?=E5=8A=9F=E8=83=BD=E9=87=8D=E5=86=99:=20=E5=9F=BA=E7=A1=80?=
 =?UTF-8?q?=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/index.vue | 89 ++++++++++++++++++++++---------------------------
 stores/index.ts | 16 +++++----
 2 files changed, 48 insertions(+), 57 deletions(-)

diff --git a/pages/index.vue b/pages/index.vue
index cf6c055..98e3585 100644
--- a/pages/index.vue
+++ b/pages/index.vue
@@ -1,6 +1,5 @@
 <template>
 	<ElForm
-		v-if="!mainStore.enableCreateServer"
 		size="small"
 		label-position="top"
 		:model="config"
@@ -180,7 +179,7 @@
 			</ElFormItem>
 		</div>
 	</ElForm>
-	<ElForm
+	<!-- <ElForm
 		v-else
 		size="small"
 		label-position="top"
@@ -253,7 +252,7 @@
 				</div>
 			</div>
 		</ElFormItem>
-	</ElForm>
+	</ElForm> -->
 	<div class="flex items-start mt-auto">
 		<div>
 			<div>
@@ -266,15 +265,7 @@
 					:disabled="data.startLoading || !data.coreVersion || data.update"
 					@click="handleConnection"
 				>
-					{{
-						!data.isStart
-							? mainStore.enableCreateServer
-								? "启动服务"
-								: "启动联机"
-							: mainStore.enableCreateServer
-							? "停止服务"
-							: "停止联机"
-					}}
+					{{ !data.isStart ? "启动联机" : "停止联机" }}
 					<template #dropdown>
 						<ElDropdownMenu>
 							<ElDropdownItem
@@ -289,16 +280,14 @@
 							>
 								分享联机相关配置
 							</ElDropdownItem>
-							<ElDropdownItem
-								disabled
-							>
+							<ElDropdownItem disabled>
 								<ElDivider class="!h-[2px] !m-0" />
 							</ElDropdownItem>
 							<ElDropdownItem
 								:icon="SetUp"
 								command="create_server"
 							>
-								{{ mainStore.enableCreateServer ? "我要联机" : "我要开服(自建)" }}
+								我要开服(自建)
 							</ElDropdownItem>
 							<ElDropdownItem
 								:icon="Tools"
@@ -598,7 +587,7 @@
 	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,
@@ -1017,23 +1006,23 @@
 			}
 		}
 
-		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.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 (config.dhcp) {
 			args.push("-d");
@@ -1205,22 +1194,22 @@
 			importConfigData.visible = true;
 		}
 		if (command === "create_server") {
-			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;
-			}
+			// 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;
+			// }
 		}
 	};
 
diff --git a/stores/index.ts b/stores/index.ts
index b4554f8..1ab7680 100644
--- a/stores/index.ts
+++ b/stores/index.ts
@@ -31,6 +31,14 @@ export default defineStore("main", {
 				enableNetCardMetric: false, //启用网卡自定义跃点
 				netCardMetricValue: 1 //自定义网卡跃点值
 			},
+			serverConfig: {
+				enableCreateServer: false, // 自建服务器
+				enableWhiteList: true, // 是否启用白名单
+
+				serverWhiteList: "", // 服务器流量转发白名单
+				enableListener: true, // 是否启用监听
+				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
@@ -86,10 +92,6 @@ export default defineStore("main", {
 			"winIpBcAutoStart",
 			"createConfigInEasytier",
 			"githubFastUrl",
-
-			"enableCreateServer",
-			"enableWhiteList",
-			"ServerWhiteList"
 		],
 		// // 除了这些，其他都要存下来
 		// omit: ["winipBcPid", "winipBcStart"]