修复开机自启搭配配置文件方式启动出现的找不到文件路径问题，并增加配置文件启动相关判断

2025-05-19 10:27:56 +00:00 · 2024-11-21 18:17:34 +08:00
parent 0776b074d2
commit c23191fe45
2 changed files with 159 additions and 89 deletions
@@ -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 />'"
@@ -11,24 +12,28 @@
 		<ElFormItem
 			label="服务器"
 			prop="serverUrl"
-			class="full-label">
+			class="full-label"
+		>
 			<template #label>
 				<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>
 					<div
 						v-else
-						class="flex-1 truncate">
+						class="flex-1 truncate"
+					>
 						<ElTooltip :content="data.coreVersion">
 							<ElTag type="info">
 								{{ data.coreVersion }}
@@ -51,7 +56,8 @@
 						@click="handleCoreManagement"
 						:loading="data.update"
 						type="primary"
-						size="small">
+						size="small"
+					>
 						内核管理
 						<!-- {{ data.coreVersion ? "更新内核" : "下载内核" }} -->
 					</ElButton>
@@ -65,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
@@ -74,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>
@@ -87,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>
@@ -97,7 +107,8 @@
 								@click.stop="handleDeleteServerUrl(item)"
 								round
 								:icon="Delete"
-								type="danger"></ElButton>
+								type="danger"
+							></ElButton>
 						</div>
 					</div>
 				</ElOption>
@@ -117,7 +128,8 @@
 					<ElInput
 						maxlength="100"
 						placeholder="请输入网络名"
-						v-model="config.networkName"></ElInput>
+						v-model="config.networkName"
+					></ElInput>
 				</ElFormItem>
 			</div>
 			<div class="flex-1">
@@ -135,7 +147,8 @@
 						maxlength="100"
 						placeholder="请输入网络密码"
 						v-model="config.networkPassword"
-						type="password"></ElInput>
+						type="password"
+					></ElInput>
 				</ElFormItem>
 			</div>
 		</div>
@@ -152,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
@@ -169,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> -->
@@ -190,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>
@@ -217,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>
@@ -272,7 +302,8 @@
 							type="primary"
 							size="small"
 							:icon="MagicStick"
-							@click="handleShowToolDialog">
+							@click="handleShowToolDialog"
+						>
 							增强工具
 						</ElButton>
 					</div>
@@ -280,7 +311,8 @@
 						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>
@@ -295,7 +327,8 @@
 		class="!mb-0"
 		v-model="coreManagementData.visible"
 		:close-on-press-escape="false"
-		title="内核管理">
+		title="内核管理"
+	>
 		<div>
 			<ElText>当前版本: {{ data.coreVersion || "-" }}</ElText>
 		</div>
@@ -305,19 +338,22 @@
 				:loading="coreManagementData.loading"
 				@click="getReleaseList"
 				size="small"
-				>刷新</ElButton
 			>
+				刷新
+			</ElButton>
 		</div>
 		<ElSelect
 			placeholder="请选择内核版本"
 			no-data-text="正在获取中..."
 			popper-class="!h-[120px]"
-			v-model="coreManagementData.data">
+			v-model="coreManagementData.data"
+		>
 			<ElOption
 				v-for="(release, idx) in data.releaseList"
 				:key="`${idx}-ray`"
 				:label="release[0]"
-				:value="`${release[2]}<>${release[1]}`">
+				:value="`${release[2]}<>${release[1]}`"
+			>
 				{{ release ? release[0] : "" }}
 			</ElOption>
 		</ElSelect>
@@ -328,25 +364,29 @@
 		</div>
 		<ElInput
 			v-model="mainStore.githubFastUrl"
-			placeholder="请输入github加速地址"></ElInput>
+			placeholder="请输入github加速地址"
+		></ElInput>
 		<template #footer>
 			<div class="text-right">
 				<ElButton
 					size="small"
 					:loading="data.update"
 					@click="handleInstallCore"
-					type="primary">
+					type="primary"
+				>
 					安装选中内核
 				</ElButton>
 				<ElButton
 					size="small"
 					type="warning"
 					@click="addQQGroup"
-					>加群获取</ElButton
 				>
+					加群获取
+				</ElButton>
 				<ElButton
 					size="small"
-					@click="coreManagementData.visible = false">
+					@click="coreManagementData.visible = false"
+				>
 					取消
 				</ElButton>
 			</div>
@@ -360,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>
@@ -374,7 +416,8 @@
 				<ElButton
 					size="small"
 					@click="handleStartImport"
-					type="primary">
+					type="primary"
+				>
 					导入
 				</ElButton>
 			</div>
@@ -388,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>
@@ -397,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>
@@ -412,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>
@@ -425,7 +473,8 @@
 				<ElButton
 					size="small"
 					@click="configStart.visible = false"
-					type="danger">
+					type="danger"
+				>
 					关闭
 				</ElButton>
 			</div>
@@ -481,31 +530,31 @@
 		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: "",
+		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);
@@ -553,7 +602,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) {
@@ -586,7 +635,7 @@
 								"netsh",
 								["interface", "ipv4", "set", "interface", devName, "metric=", `${mainStore.config.netCardMetricValue}`],
 								{
-									encoding: "gb2312",
+									encoding: "gb2312"
 								}
 							).execute();
 						} catch (err) {
@@ -603,7 +652,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;
 				}
@@ -611,14 +660,14 @@
 			this.unListenThreadId = unListen;
 		},
 		async listenConfigStart() {
-			const unListen = await listen("config", (event) => {
+			const unListen = await listen("config", event => {
 				// console.error("config", event.payload);
 				const ipv4 = config.ipv4;
 				mainStore.$patch(event.payload as any);
 				config.ipv4 = ipv4;
 			});
 			this.unListenConfigStart = unListen;
-		},
+		}
 	};

 	const unListenAll = async () => {
@@ -695,10 +744,10 @@
 		coreManagementData.loading = true;
 		const list = await invoke<string[][][]>("fetch_easytier_list");
 		data.releaseList = [
-			...list.flat().filter((el) => {
+			...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);
@@ -804,8 +853,8 @@
 						config: {
 							...mainStore.config,
 							...guiJson,
-							serverUrl: saveServerUrl,
-						},
+							serverUrl: saveServerUrl
+						}
 					});
 					if (mainStore.createConfigInEasytier) {
 						await updateConfigJson(data.configJsonSeverUrl);
@@ -815,7 +864,7 @@
 					ElMessage.error(`config.json格式错误`);
 				} finally {
 					mainStore.$patch({
-						createConfigInEasytier: true, // 发现本地存在config.json 默认启用该功能
+						createConfigInEasytier: true // 发现本地存在config.json 默认启用该功能
 					});
 				}
 			}
@@ -856,13 +905,31 @@
 	const getArgs = async () => {
 		// console.error(config.proxyNetworks);
 		const args = [];
-		if (mainStore.configStartEnable && mainStore.configPath) {
-			// const resourceDir = await getResourceDir();
-			// const configPath = await join(resourceDir, mainStore.configPath);
-			// args.push("-c", configPath);
-
-			args.push("-c", mainStore.configPath);
-			return args;
+		if (mainStore.configStartEnable) {
+			if (mainStore.configPath) {
+				const isExists = await exists(mainStore.configPath, { baseDir: BaseDirectory.Resource });
+				if (isExists) {
+					const resourceDir = await getResourceDir();
+					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");
@@ -881,7 +948,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");
@@ -897,8 +964,8 @@
 			const reg = /\d+\.\d+\.\d+\.\d+\/\d+/g;
 			const formatProxyNetworks = config.proxyNetworks
 				.split("\n")
-				.map((item) => item.trim())
-				.filter((item) => item && reg.test(item));
+				.map(item => item.trim())
+				.filter(item => item && reg.test(item));
 			args.push("--proxy-networks", ...formatProxyNetworks);
 			config.proxyNetworks = formatProxyNetworks.join("\n");
 		}
@@ -942,7 +1009,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) {
@@ -963,12 +1030,13 @@
 		} else {
 			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 = ""; //清空日志
@@ -977,7 +1045,7 @@
 			await listenObj.listenOutput();

 			await invoke("run_command", {
-				args,
+				args
 			});
 		}
 	};
@@ -991,10 +1059,10 @@
 			if (isExists) {
 				const entries = await readDir(path, { baseDir: BaseDirectory.Resource });
 				configStart.list = entries
-					.filter((item) => item.isFile)
-					.map((item) => ({
+					.filter(item => item.isFile)
+					.map(item => ({
 						name: item.name,
-						path: `${path}${item.name}`,
+						path: `${path}${item.name}`
 					})) as any;
 			} else {
 				mainStore.configStartEnable = false;
@@ -1037,14 +1105,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;
@@ -1092,7 +1160,7 @@
 				title: "成员列表",
 				width: 875,
 				height: 380,
-				url: "#/member",
+				url: "#/member"
 			},
 			() => {
 				data.memberVisible = true;
@@ -1111,7 +1179,7 @@
 				width: 600,
 				height: 380,
 				resizable: false,
-				url: "#/log",
+				url: "#/log"
 			},
 			(_, appWindow) => {
 				data.logVisible = true;
@@ -1134,7 +1202,7 @@
 				width: 600,
 				height: 380,
 				resizable: false,
-				url: "#/cidr",
+				url: "#/cidr"
 			},
 			(_, appWindow) => {
 				data.cidrVisible = true;
@@ -1153,7 +1221,7 @@
 				width: 600,
 				height: 380,
 				resizable: false,
-				url: "#/advance",
+				url: "#/advance"
 			},
 			(_, appWindow) => {
 				data.advanceVisible = true;
@@ -1172,7 +1240,7 @@
 				width: 460,
 				height: 480,
 				resizable: true,
-				url: "#/tool",
+				url: "#/tool"
 			},
 			(_, appWindow) => {
 				data.toolVisible = true;
@@ -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",