Compare commits

..
3 Commits
7 changed files with 184 additions and 98 deletions
+16 -4
View File
@@ -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; let tray;
try { try {
tray = await TrayIcon.getById(DEFAULT_TRAY_NAME); tray = await TrayIcon.getById(DEFAULT_TRAY_NAME);
@@ -28,7 +28,7 @@ export async function useTray(init: boolean = false, beforExit: Function) {
id: DEFAULT_TRAY_NAME, id: DEFAULT_TRAY_NAME,
menu: await Menu.new({ menu: await Menu.new({
id: "main", id: "main",
items: await generateMenuItem(beforExit), items: await generateMenuItem(beforExit, handleConnection),
}), }),
action: async (e) => { action: async (e) => {
toggleVisibility(); toggleVisibility();
@@ -46,7 +46,7 @@ export async function useTray(init: boolean = false, beforExit: Function) {
tray.setMenu( tray.setMenu(
await Menu.new({ await Menu.new({
id: "main", 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; return tray;
} }
export async function generateMenuItem(beforExit: Function) { export async function generateMenuItem(beforExit: Function, handleConnection:Function) {
return [ return [
await MenuItemShow("显示 / 隐藏"), await MenuItemShow("显示 / 隐藏"),
await MenuItemExchangeConnection("联机 / 断开", handleConnection),
await MenuItemTheme(), await MenuItemTheme(),
await PredefinedMenuItem.new({ item: "Separator" }), await PredefinedMenuItem.new({ item: "Separator" }),
await MenuItemExit("退出", beforExit), 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() { export async function MenuItemTheme() {
return await MenuItem.new({ return await MenuItem.new({
id: "theme", id: "theme",
+1 -1
View File
@@ -3,7 +3,7 @@
"private": true, "private": true,
"author": "leizi97", "author": "leizi97",
"description": "A simple network initiator based on Easytier", "description": "A simple network initiator based on Easytier",
"version": "1.2.3", "version": "1.2.4",
"scripts": { "scripts": {
"dev": "nuxt dev --dotenv env/.env.dev --host 0.0.0.0", "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"
+161 -89
View File
@@ -2,7 +2,8 @@
<ElForm <ElForm
size="small" size="small"
label-position="top" label-position="top"
:model="config"> :model="config"
>
<!-- element-loading-custom-class="config-start" <!-- element-loading-custom-class="config-start"
v-loading="mainStore.configStartEnable" v-loading="mainStore.configStartEnable"
:element-loading-spinner="'<path />'" :element-loading-spinner="'<path />'"
@@ -11,24 +12,28 @@
<ElFormItem <ElFormItem
label="服务器" label="服务器"
prop="serverUrl" prop="serverUrl"
class="full-label"> class="full-label"
>
<template #label> <template #label>
<div class="flex items-center flex-nowrap gap-[0_5px]"> <div class="flex items-center flex-nowrap gap-[0_5px]">
<div>服务器</div> <div>服务器</div>
<span>-</span> <span>-</span>
<ElTag <ElTag
effect="dark" effect="dark"
:type="data.isSuccessGetIp ? 'success' : 'info'"> :type="data.isSuccessGetIp ? 'success' : 'info'"
>
{{ data.isSuccessGetIp ? "联机成功" : data.isStart && !data.isSuccessGetIp ? "联机中" : "未联机" }} {{ data.isSuccessGetIp ? "联机成功" : data.isStart && !data.isSuccessGetIp ? "联机中" : "未联机" }}
</ElTag> </ElTag>
<ElButton <ElButton
v-if="!data.coreVersion" v-if="!data.coreVersion"
@click="getCoreVersion(true)"> @click="getCoreVersion(true)"
>
获取内核版本 获取内核版本
</ElButton> </ElButton>
<div <div
v-else v-else
class="flex-1 truncate"> class="flex-1 truncate"
>
<ElTooltip :content="data.coreVersion"> <ElTooltip :content="data.coreVersion">
<ElTag type="info"> <ElTag type="info">
{{ data.coreVersion }} {{ data.coreVersion }}
@@ -51,7 +56,8 @@
@click="handleCoreManagement" @click="handleCoreManagement"
:loading="data.update" :loading="data.update"
type="primary" type="primary"
size="small"> size="small"
>
内核管理 内核管理
<!-- {{ data.coreVersion ? "更新内核" : "下载内核" }} --> <!-- {{ data.coreVersion ? "更新内核" : "下载内核" }} -->
</ElButton> </ElButton>
@@ -65,7 +71,8 @@
placeholder="请选择服务器地址" placeholder="请选择服务器地址"
default-first-option default-first-option
v-model="config.serverUrl" v-model="config.serverUrl"
@change="handleServerUrlChange"> @change="handleServerUrlChange"
>
<template #prefix> <template #prefix>
<div :class="config.protocol && config.protocol.length > 1 ? 'w-[120px]' : 'w-[80px]'"> <div :class="config.protocol && config.protocol.length > 1 ? 'w-[120px]' : 'w-[80px]'">
<ElSelect <ElSelect
@@ -74,12 +81,14 @@
collapse-tags collapse-tags
@click.stop @click.stop
v-model="config.protocol" v-model="config.protocol"
@change="handleServerUrlChange"> @change="handleServerUrlChange"
>
<ElOption <ElOption
v-for="item in protocols" v-for="item in protocols"
:key="item" :key="item"
:label="item" :label="item"
:value="item"></ElOption> :value="item"
></ElOption>
</ElSelect> </ElSelect>
</div> </div>
</template> </template>
@@ -87,7 +96,8 @@
v-for="item in mainStore.basePeers" v-for="item in mainStore.basePeers"
:key="item" :key="item"
:label="item" :label="item"
:value="item"> :value="item"
>
<div class="flex items-center gap-[20px] overflow-hidden flex-nowrap max-w-[calc(100vw-62px)]"> <div class="flex items-center gap-[20px] overflow-hidden flex-nowrap max-w-[calc(100vw-62px)]">
<ElTooltip :content="item"> <ElTooltip :content="item">
<p class="truncate">{{ item }}</p> <p class="truncate">{{ item }}</p>
@@ -97,7 +107,8 @@
@click.stop="handleDeleteServerUrl(item)" @click.stop="handleDeleteServerUrl(item)"
round round
:icon="Delete" :icon="Delete"
type="danger"></ElButton> type="danger"
></ElButton>
</div> </div>
</div> </div>
</ElOption> </ElOption>
@@ -117,7 +128,8 @@
<ElInput <ElInput
maxlength="100" maxlength="100"
placeholder="请输入网络名" placeholder="请输入网络名"
v-model="config.networkName"></ElInput> v-model="config.networkName"
></ElInput>
</ElFormItem> </ElFormItem>
</div> </div>
<div class="flex-1"> <div class="flex-1">
@@ -135,7 +147,8 @@
maxlength="100" maxlength="100"
placeholder="请输入网络密码" placeholder="请输入网络密码"
v-model="config.networkPassword" v-model="config.networkPassword"
type="password"></ElInput> type="password"
></ElInput>
</ElFormItem> </ElFormItem>
</div> </div>
</div> </div>
@@ -152,11 +165,13 @@
<ElInput <ElInput
maxlength="100" maxlength="100"
placeholder="例如: Player1" placeholder="例如: Player1"
v-model="config.hostname"></ElInput> v-model="config.hostname"
></ElInput>
</ElFormItem> </ElFormItem>
<ElFormItem <ElFormItem
class="w-[70%]" class="w-[70%]"
label="局域网IP"> label="局域网IP"
>
<template #label> <template #label>
<div class="flex items-center h-[20px]"> <div class="flex items-center h-[20px]">
虚拟网IP 虚拟网IP
@@ -169,14 +184,16 @@
inline-prompt inline-prompt
inactive-text="固定IP" inactive-text="固定IP"
active-text="动态获取IP" active-text="动态获取IP"
size="small"></ElSwitch> size="small"
></ElSwitch>
</div> </div>
</template> </template>
<ElInput <ElInput
maxlength="100" maxlength="100"
:disabled="config.dhcp" :disabled="config.dhcp"
:placeholder="data.isStart && config.dhcp ? '等待动态分配IP...' : '例如: 10.126.126.1'" :placeholder="data.isStart && config.dhcp ? '等待动态分配IP...' : '例如: 10.126.126.1'"
v-model="config.ipv4"></ElInput> v-model="config.ipv4"
></ElInput>
</ElFormItem> </ElFormItem>
</div> </div>
<!-- </div> --> <!-- </div> -->
@@ -190,24 +207,28 @@
size="default" size="default"
:type="!data.isStart ? 'primary' : 'danger'" :type="!data.isStart ? 'primary' : 'danger'"
:disabled="data.startLoading || !data.coreVersion || data.update" :disabled="data.startLoading || !data.coreVersion || data.update"
@click="handleConnection"> @click="handleConnection"
>
{{ !data.isStart ? "启动联机" : "停止联机" }} {{ !data.isStart ? "启动联机" : "停止联机" }}
<template #dropdown> <template #dropdown>
<ElDropdownMenu> <ElDropdownMenu>
<ElDropdownItem <ElDropdownItem
command="import_config" command="import_config"
:icon="Link"> :icon="Link"
>
导入配置 导入配置
</ElDropdownItem> </ElDropdownItem>
<ElDropdownItem <ElDropdownItem
command="share_config" command="share_config"
:icon="Share"> :icon="Share"
>
分享配置 分享配置
</ElDropdownItem> </ElDropdownItem>
<ElDropdownItem <ElDropdownItem
:icon="Tools" :icon="Tools"
command="toml" command="toml"
:disabled="data.isStart"> :disabled="data.isStart"
>
使用外部配置文件 使用外部配置文件
</ElDropdownItem> </ElDropdownItem>
</ElDropdownMenu> </ElDropdownMenu>
@@ -217,51 +238,60 @@
<div class="mt-[6px] pl-[2px]"> <div class="mt-[6px] pl-[2px]">
<ElTooltip <ElTooltip
placement="left" placement="left"
content="日志"> content="日志"
>
<ElButton <ElButton
:type="!data.logVisible ? 'info' : 'warning'" :type="!data.logVisible ? 'info' : 'warning'"
@click="handleShowLogDialog" @click="handleShowLogDialog"
:icon="List" :icon="List"
size="small" size="small"
plain></ElButton> plain
></ElButton>
</ElTooltip> </ElTooltip>
<ElTooltip <ElTooltip
placement="left" placement="left"
content="成员"> content="成员"
>
<ElButton <ElButton
@click="handleShowMemberDialog" @click="handleShowMemberDialog"
:icon="UserFilled" :icon="UserFilled"
plain plain
type="success" type="success"
size="small"></ElButton> size="small"
></ElButton>
</ElTooltip> </ElTooltip>
</div> </div>
</div> </div>
<div class="ml-auto"> <div class="ml-auto">
<ElCheckbox <ElCheckbox
v-model="config.disbleP2p" v-model="config.disbleP2p"
size="small"> size="small"
>
强制中转 强制中转
</ElCheckbox> </ElCheckbox>
<ElTooltip <ElTooltip
placement="top-start" placement="top-start"
content="自启后隐藏于托盘,不显示界面"> content="自启后隐藏于托盘,不显示界面"
>
<ElCheckbox <ElCheckbox
@change="handleAutoStartByTask" @change="handleAutoStartByTask"
:model-value="config.autoStart" :model-value="config.autoStart"
size="small"> size="small"
>
开机自启 开机自启
</ElCheckbox> </ElCheckbox>
</ElTooltip> </ElTooltip>
<div> <div>
<ElButton <ElButton
@click="handleShowCidrDialog" @click="handleShowCidrDialog"
:icon="Share"> :icon="Share"
>
子网代理 子网代理
</ElButton> </ElButton>
<ElButton <ElButton
@click="handleShowAdvanceDialog" @click="handleShowAdvanceDialog"
:icon="Setting"> :icon="Setting"
>
高级选项 高级选项
</ElButton> </ElButton>
</div> </div>
@@ -272,7 +302,8 @@
type="primary" type="primary"
size="small" size="small"
:icon="MagicStick" :icon="MagicStick"
@click="handleShowToolDialog"> @click="handleShowToolDialog"
>
增强工具 增强工具
</ElButton> </ElButton>
</div> </div>
@@ -280,7 +311,8 @@
class="!text-[9px] pb-[2px] ml-[8px] truncate" class="!text-[9px] pb-[2px] ml-[8px] truncate"
type="info" type="info"
:underline="false" :underline="false"
@click="open('https://github.com/EasyTier/EasytierGame')"> @click="open('https://github.com/EasyTier/EasytierGame')"
>
EasytierGame主页 EasytierGame主页
</ElLink> </ElLink>
</div> </div>
@@ -295,7 +327,8 @@
class="!mb-0" class="!mb-0"
v-model="coreManagementData.visible" v-model="coreManagementData.visible"
:close-on-press-escape="false" :close-on-press-escape="false"
title="内核管理"> title="内核管理"
>
<div> <div>
<ElText>当前版本: {{ data.coreVersion || "-" }}</ElText> <ElText>当前版本: {{ data.coreVersion || "-" }}</ElText>
</div> </div>
@@ -305,19 +338,22 @@
:loading="coreManagementData.loading" :loading="coreManagementData.loading"
@click="getReleaseList" @click="getReleaseList"
size="small" size="small"
>刷新</ElButton
> >
刷新
</ElButton>
</div> </div>
<ElSelect <ElSelect
placeholder="请选择内核版本" placeholder="请选择内核版本"
no-data-text="正在获取中..." no-data-text="正在获取中..."
popper-class="!h-[120px]" popper-class="!h-[120px]"
v-model="coreManagementData.data"> v-model="coreManagementData.data"
>
<ElOption <ElOption
v-for="(release, idx) in data.releaseList" v-for="(release, idx) in data.releaseList"
:key="`${idx}-ray`" :key="`${idx}-ray`"
:label="release[0]" :label="release[0]"
:value="`${release[2]}<>${release[1]}`"> :value="`${release[2]}<>${release[1]}`"
>
{{ release ? release[0] : "" }} {{ release ? release[0] : "" }}
</ElOption> </ElOption>
</ElSelect> </ElSelect>
@@ -328,25 +364,29 @@
</div> </div>
<ElInput <ElInput
v-model="mainStore.githubFastUrl" v-model="mainStore.githubFastUrl"
placeholder="请输入github加速地址"></ElInput> placeholder="请输入github加速地址"
></ElInput>
<template #footer> <template #footer>
<div class="text-right"> <div class="text-right">
<ElButton <ElButton
size="small" size="small"
:loading="data.update" :loading="data.update"
@click="handleInstallCore" @click="handleInstallCore"
type="primary"> type="primary"
>
安装选中内核 安装选中内核
</ElButton> </ElButton>
<ElButton <ElButton
size="small" size="small"
type="warning" type="warning"
@click="addQQGroup" @click="addQQGroup"
>加群获取</ElButton
> >
加群获取
</ElButton>
<ElButton <ElButton
size="small" size="small"
@click="coreManagementData.visible = false"> @click="coreManagementData.visible = false"
>
取消 取消
</ElButton> </ElButton>
</div> </div>
@@ -360,12 +400,14 @@
class="!mb-0" class="!mb-0"
v-model="importConfigData.visible" v-model="importConfigData.visible"
:close-on-press-escape="false" :close-on-press-escape="false"
title="导入分享"> title="导入分享"
>
<ElInput <ElInput
type="textarea" type="textarea"
:rows="6" :rows="6"
placeholder="请粘贴分享的配置" placeholder="请粘贴分享的配置"
v-model="importConfigData.data"></ElInput> v-model="importConfigData.data"
></ElInput>
<template #footer> <template #footer>
<div> <div>
<el-text type="danger">导入成功后您当前的部分配置将被替换</el-text> <el-text type="danger">导入成功后您当前的部分配置将被替换</el-text>
@@ -374,7 +416,8 @@
<ElButton <ElButton
size="small" size="small"
@click="handleStartImport" @click="handleStartImport"
type="primary"> type="primary"
>
导入 导入
</ElButton> </ElButton>
</div> </div>
@@ -388,7 +431,8 @@
class="!mb-0" class="!mb-0"
v-model="configStart.visible" v-model="configStart.visible"
:close-on-press-escape="false" :close-on-press-escape="false"
title="配置文件启动"> title="配置文件启动"
>
<div class="flex items-center gap-[0_4px]"> <div class="flex items-center gap-[0_4px]">
<span>启用</span> <span>启用</span>
<ElSwitch v-model="mainStore.configStartEnable"></ElSwitch> <ElSwitch v-model="mainStore.configStartEnable"></ElSwitch>
@@ -397,14 +441,16 @@
</ElTooltip> </ElTooltip>
<ElButton <ElButton
@click="openConfigDir" @click="openConfigDir"
size="small"> size="small"
>
打开配置目录 打开配置目录
</ElButton> </ElButton>
<ElButton <ElButton
@click="handleStartCommand('toml')" @click="handleStartCommand('toml')"
type="primary" type="primary"
:icon="RefreshRight" :icon="RefreshRight"
size="small"> size="small"
>
刷新 刷新
</ElButton> </ElButton>
</div> </div>
@@ -412,12 +458,14 @@
<ElSelect <ElSelect
v-model="mainStore.configPath" v-model="mainStore.configPath"
no-data-text="目录没有配置文件" no-data-text="目录没有配置文件"
placeholder="选择配置文件"> placeholder="选择配置文件"
>
<ElOption <ElOption
v-for="item in configStart.list" v-for="item in configStart.list"
:key="item.path" :key="item.path"
:value="item.path" :value="item.path"
:label="item.name"></ElOption> :label="item.name"
></ElOption>
</ElSelect> </ElSelect>
</div> </div>
<template #footer> <template #footer>
@@ -425,7 +473,8 @@
<ElButton <ElButton
size="small" size="small"
@click="configStart.visible = false" @click="configStart.visible = false"
type="danger"> type="danger"
>
关闭 关闭
</ElButton> </ElButton>
</div> </div>
@@ -459,6 +508,9 @@
is_close = true; is_close = true;
await invoke("stop_command", { child_id: listenObj.thread_id || 0 }); 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: data.winipBcPid || 0 });
}, async () => {
await handleConnection();
return data.isStart
}); });
const mainStore = useMainStore(); const mainStore = useMainStore();
@@ -481,31 +533,31 @@
startLoading: false, startLoading: false,
isStart: false, isStart: false,
connectionSuccess: false, connectionSuccess: false,
configJsonSeverUrl: "", // 本地保存一次,用于回填config.json configJsonSeverUrl: "" // 本地保存一次,用于回填config.json
}); });
const configStart = reactive<{ list: Array<{ path: string; name: string }>; [key: string]: any }>({ const configStart = reactive<{ list: Array<{ path: string; name: string }>; [key: string]: any }>({
visible: false, visible: false,
loading: false, loading: false,
list: [], //配置文件列表 list: [] //配置文件列表
}); });
const importConfigData = reactive<{ data: ""; [key: string]: any }>({ const importConfigData = reactive<{ data: ""; [key: string]: any }>({
visible: false, visible: false,
loading: false, loading: false,
data: "", data: ""
}); });
const coreManagementData = reactive<{ data: ""; [key: string]: any }>({ const coreManagementData = reactive<{ data: ""; [key: string]: any }>({
visible: false, visible: false,
loading: false, loading: false,
data: "", data: ""
}); });
const closePrevent = async () => { const closePrevent = async () => {
const appWindow = getCurrentWindow(); const appWindow = getCurrentWindow();
if (appWindow.label == "main") { if (appWindow.label == "main") {
appWindow.onCloseRequested(async (event) => { appWindow.onCloseRequested(async event => {
// console.error(appWindow.label); // console.error(appWindow.label);
if (!is_close) { if (!is_close) {
// console.error(1); // console.error(1);
@@ -553,7 +605,7 @@
thread_id: null, thread_id: null,
async listenOutput() { async listenOutput() {
// const appWindow = getCurrentWindow(); // const appWindow = getCurrentWindow();
const unListen = await listen("command-output", async (event) => { const unListen = await listen("command-output", async event => {
data.isStart = true; data.isStart = true;
// console.error(event.payload); // console.error(event.payload);
if (event.payload) { if (event.payload) {
@@ -586,7 +638,7 @@
"netsh", "netsh",
["interface", "ipv4", "set", "interface", devName, "metric=", `${mainStore.config.netCardMetricValue}`], ["interface", "ipv4", "set", "interface", devName, "metric=", `${mainStore.config.netCardMetricValue}`],
{ {
encoding: "gb2312", encoding: "gb2312"
} }
).execute(); ).execute();
} catch (err) { } catch (err) {
@@ -603,7 +655,7 @@
this.unListenOutPut = unListen; this.unListenOutPut = unListen;
}, },
async listenThreadId() { async listenThreadId() {
const unListen = await listen("thread-id", (event) => { const unListen = await listen("thread-id", event => {
if (event.payload) { if (event.payload) {
this.thread_id = event.payload; this.thread_id = event.payload;
} }
@@ -611,14 +663,14 @@
this.unListenThreadId = unListen; this.unListenThreadId = unListen;
}, },
async listenConfigStart() { 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; const ipv4 = config.ipv4;
mainStore.$patch(event.payload as any); mainStore.$patch(event.payload as any);
config.ipv4 = ipv4; config.ipv4 = ipv4;
}); });
this.unListenConfigStart = unListen; this.unListenConfigStart = unListen;
}, }
}; };
const unListenAll = async () => { const unListenAll = async () => {
@@ -695,10 +747,10 @@
coreManagementData.loading = true; coreManagementData.loading = true;
const list = await invoke<string[][][]>("fetch_easytier_list"); const list = await invoke<string[][][]>("fetch_easytier_list");
data.releaseList = [ data.releaseList = [
...list.flat().filter((el) => { ...list.flat().filter(el => {
// console.log(el, el[0], el[2]); // console.log(el, el[0], el[2]);
return el && el[0] && el[2] && !el[2].includes("gui"); return el && el[0] && el[2] && !el[2].includes("gui");
}), })
]; ];
coreManagementData.loading = false; coreManagementData.loading = false;
// console.log(data.releaseList); // console.log(data.releaseList);
@@ -804,8 +856,8 @@
config: { config: {
...mainStore.config, ...mainStore.config,
...guiJson, ...guiJson,
serverUrl: saveServerUrl, serverUrl: saveServerUrl
}, }
}); });
if (mainStore.createConfigInEasytier) { if (mainStore.createConfigInEasytier) {
await updateConfigJson(data.configJsonSeverUrl); await updateConfigJson(data.configJsonSeverUrl);
@@ -815,7 +867,7 @@
ElMessage.error(`config.json格式错误`); ElMessage.error(`config.json格式错误`);
} finally { } finally {
mainStore.$patch({ mainStore.$patch({
createConfigInEasytier: true, // 发现本地存在config.json 默认启用该功能 createConfigInEasytier: true // 发现本地存在config.json 默认启用该功能
}); });
} }
} }
@@ -856,13 +908,31 @@
const getArgs = async () => { const getArgs = async () => {
// console.error(config.proxyNetworks); // console.error(config.proxyNetworks);
const args = []; 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);
return args; 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) { if (config.dhcp) {
args.push("-d"); args.push("-d");
@@ -881,7 +951,7 @@
} }
if (config.serverUrl) { if (config.serverUrl) {
const formatUrl = config.serverUrl.replace(/\\/g, "/"); 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) { if (config.disbleP2p) {
args.push("--disable-p2p"); args.push("--disable-p2p");
@@ -897,8 +967,8 @@
const reg = /\d+\.\d+\.\d+\.\d+\/\d+/g; const reg = /\d+\.\d+\.\d+\.\d+\/\d+/g;
const formatProxyNetworks = config.proxyNetworks const formatProxyNetworks = config.proxyNetworks
.split("\n") .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); args.push("--proxy-networks", ...formatProxyNetworks);
config.proxyNetworks = formatProxyNetworks.join("\n"); config.proxyNetworks = formatProxyNetworks.join("\n");
} }
@@ -942,7 +1012,7 @@
config.ipv4 = ""; config.ipv4 = "";
} }
const memberDialog = await getAllWebviewWindows(); 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) { if (memberDialogs && memberDialogs.length > 0) {
data.memberVisible = false; data.memberVisible = false;
for (const memberDialog of memberDialogs) { for (const memberDialog of memberDialogs) {
@@ -961,14 +1031,16 @@
if (data.isStart) { if (data.isStart) {
await reset(); await reset();
} else { } else {
await setTrayTooltip(tray, "请求联机中...");
const args = await getArgs(); const args = await getArgs();
if (!args || args.length <= 0) { if (!args || args.length <= 0) {
return ElMessage.error("无配置"); await reset();
return;
} }
if (args[0] === "-c") { if (args[0] === "-c") {
ElMessage.warning({ ElMessage.warning({
message: "使用配置文件中.", message: "使用配置文件中.",
duration: 5000, duration: 5000
}); });
} }
data.log = ""; //清空日志 data.log = ""; //清空日志
@@ -977,7 +1049,7 @@
await listenObj.listenOutput(); await listenObj.listenOutput();
await invoke("run_command", { await invoke("run_command", {
args, args
}); });
} }
}; };
@@ -991,10 +1063,10 @@
if (isExists) { if (isExists) {
const entries = await readDir(path, { baseDir: BaseDirectory.Resource }); const entries = await readDir(path, { baseDir: BaseDirectory.Resource });
configStart.list = entries configStart.list = entries
.filter((item) => item.isFile) .filter(item => item.isFile)
.map((item) => ({ .map(item => ({
name: item.name, name: item.name,
path: `${path}${item.name}`, path: `${path}${item.name}`
})) as any; })) as any;
} else { } else {
mainStore.configStartEnable = false; mainStore.configStartEnable = false;
@@ -1037,14 +1109,14 @@
try { try {
await ElMessageBox.confirm("确定导入?", "提示", { await ElMessageBox.confirm("确定导入?", "提示", {
confirmButtonText: "确定", confirmButtonText: "确定",
cancelButtonText: "取消", cancelButtonText: "取消"
}); });
const payload = JSON.parse(decodeURIComponent(atob(importConfigData.data))); const payload = JSON.parse(decodeURIComponent(atob(importConfigData.data)));
mainStore.$patch({ mainStore.$patch({
config: { config: {
...mainStore.config, ...mainStore.config,
...payload.config, ...payload.config
}, }
}); });
ElMessage.success("导入成功"); ElMessage.success("导入成功");
importConfigData.visible = false; importConfigData.visible = false;
@@ -1092,7 +1164,7 @@
title: "成员列表", title: "成员列表",
width: 875, width: 875,
height: 380, height: 380,
url: "#/member", url: "#/member"
}, },
() => { () => {
data.memberVisible = true; data.memberVisible = true;
@@ -1111,7 +1183,7 @@
width: 600, width: 600,
height: 380, height: 380,
resizable: false, resizable: false,
url: "#/log", url: "#/log"
}, },
(_, appWindow) => { (_, appWindow) => {
data.logVisible = true; data.logVisible = true;
@@ -1134,7 +1206,7 @@
width: 600, width: 600,
height: 380, height: 380,
resizable: false, resizable: false,
url: "#/cidr", url: "#/cidr"
}, },
(_, appWindow) => { (_, appWindow) => {
data.cidrVisible = true; data.cidrVisible = true;
@@ -1153,7 +1225,7 @@
width: 600, width: 600,
height: 380, height: 380,
resizable: false, resizable: false,
url: "#/advance", url: "#/advance"
}, },
(_, appWindow) => { (_, appWindow) => {
data.advanceVisible = true; data.advanceVisible = true;
@@ -1172,7 +1244,7 @@
width: 460, width: 460,
height: 480, height: 480,
resizable: true, resizable: true,
url: "#/tool", url: "#/tool"
}, },
(_, appWindow) => { (_, appWindow) => {
data.toolVisible = true; data.toolVisible = true;
+1 -1
View File
@@ -1176,7 +1176,7 @@ checksum = "0d6ef0072f8a535281e4876be788938b528e9a1d43900b82c2569af7da799125"
[[package]] [[package]]
name = "easytier-game" name = "easytier-game"
version = "1.2.3" version = "1.2.4"
dependencies = [ dependencies = [
"log", "log",
"planif", "planif",
+1 -1
View File
@@ -1,6 +1,6 @@
[package] [package]
name = "easytier-game" name = "easytier-game"
version = "1.2.3" version = "1.2.4"
homepage = "https://github.com/EasyTier/EasyTier" homepage = "https://github.com/EasyTier/EasyTier"
repository = "https://github.com/EasyTier/EasytierGame" repository = "https://github.com/EasyTier/EasytierGame"
description = "A simple network initiator based on Easytier" description = "A simple network initiator based on Easytier"
+2
View File
@@ -15,6 +15,8 @@
"core:window:allow-minimize", "core:window:allow-minimize",
"core:window:allow-hide", "core:window:allow-hide",
"core:window:allow-close", "core:window:allow-close",
"core:window:allow-set-focus",
"core:window:allow-is-visible",
"shell:allow-open", "shell:allow-open",
"core:window:allow-show", "core:window:allow-show",
"core:window:allow-create", "core:window:allow-create",
+2 -2
View File
@@ -1,7 +1,7 @@
{ {
"$schema": "../node_modules/@tauri-apps/cli/config.schema.json", "$schema": "../node_modules/@tauri-apps/cli/config.schema.json",
"productName": "easytier-game", "productName": "easytier-game",
"version": "1.2.3", "version": "1.2.4",
"identifier": "com.tauri.easytier-game", "identifier": "com.tauri.easytier-game",
"build": { "build": {
@@ -13,7 +13,7 @@
"app": { "app": {
"windows": [ "windows": [
{ {
"title": "easytier-game 1.2.3", "title": "easytier-game 1.2.4",
"label": "main", "label": "main",
"minWidth": 340, "minWidth": 340,
"width": 340, "width": 340,