mirror of
https://github.com/EasyTier/EasytierGame.git
synced 2025-05-19 10:27:56 +00:00
Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
 黑先森
|
3aa90dbb67 | ||
|
黑先森
|
02b53098e8 | ||
|
黑先森
|
c9fcc40ee3 | ||
|
黑先森
|
5e418bd6e5 | ||
|
黑先森
|
779f5cecf1 | ||
|
黑先森
|
8373efa3ba | ||
|
黑先森
|
73ae6b90db | ||
|
黑先森
|
55c6e49d4a | ||
|
黑先森
|
5fc931f94e |
@@ -29,6 +29,7 @@ Releases： [https://github.com/EasyTier/EasytierGame/releases](https://github.c
|
||||
|
||||
|
||||
- easytier内核升级后，可以点击内核管理按钮就可以进行内核切换和更新，但是需要出国或者github加速链接，如果无法更新，可以在群里获取
|
||||
- 1.2.6内核管理下载的内核 保存于easytier/cache目录，下次切换不用二次下载
|
||||
|
||||
|
||||
- 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)
|
||||
|
||||
|
||||
- 1.2.6重写 自建服务器功能，可以自行搭建服务器，但是需要一些网络知识，具体可以查看文档[自建服务器](https://www.easytier.top/guide/network/host-public-server.html),也可查看帮助.txt
|
||||
|
||||
|
||||
## 特性
|
||||
|
||||
- 基于easytier组网工具开发，界面清晰简单
|
||||
|
||||
Binary file not shown.
|
After Width: | Height: | Size: 55 KiB |
@@ -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;
|
||||
};
|
||||
@@ -37,7 +37,7 @@ export default async (
|
||||
defaultOpts.y = logicalPosition.y;
|
||||
}
|
||||
dialog = new WebviewWindow(label, { ...defaultOpts, ...options });
|
||||
unlistenLogCreated = await dialog.once("tauri://webview-created", async () => {
|
||||
unlistenLogCreated = await dialog.listen("tauri://webview-created", async () => {
|
||||
if (dialog) {
|
||||
afterCreatedFunc && (await afterCreatedFunc(dialog, appWindow));
|
||||
await dialog.show();
|
||||
|
||||
Vendored
+1
@@ -1,4 +1,5 @@
|
||||
VITE_CONFIG_PATH=easytier/config/
|
||||
VITE_CONFIG_FILE_NAME=easytier/config.json
|
||||
VITE_LOG_PATH=easytier/logs/
|
||||
VITE_CACHE_PATH=easytier/cache/
|
||||
VITE_AUTO_START_SERVICE_NAME=easytierGameAutoStart
|
||||
Vendored
+1
@@ -1,4 +1,5 @@
|
||||
VITE_CONFIG_PATH=easytier/config/
|
||||
VITE_CONFIG_FILE_NAME=easytier/config.json
|
||||
VITE_LOG_PATH=easytier/logs/
|
||||
VITE_CACHE_PATH=easytier/cache/
|
||||
VITE_AUTO_START_SERVICE_NAME=easytierGameAutoStart
|
||||
+2
-1
@@ -5,7 +5,8 @@
|
||||
<script setup lang="tsx">
|
||||
//屏蔽右键菜单
|
||||
document.addEventListener("contextmenu", (e: MouseEvent) => {
|
||||
if (import.meta.env.PROD) {
|
||||
const el = (e.target as HTMLElement);
|
||||
if (import.meta.env.PROD && !el.classList.contains("el-input__inner") && !el.classList.contains("el-textarea__inner")) { // 所有输入框不禁用右键
|
||||
e.preventDefault();
|
||||
}
|
||||
});
|
||||
|
||||
@@ -9,6 +9,8 @@ export default defineNuxtConfig({
|
||||
port: 5000
|
||||
},
|
||||
|
||||
telemetry: false,
|
||||
|
||||
imports: {
|
||||
autoImport: false
|
||||
},
|
||||
|
||||
+3
-3
@@ -3,7 +3,7 @@
|
||||
"private": true,
|
||||
"author": "leizi97",
|
||||
"description": "A simple network initiator based on Easytier",
|
||||
"version": "1.2.6",
|
||||
"version": "1.2.8",
|
||||
"scripts": {
|
||||
"dev": "nuxt dev --dotenv env/.env.dev --host 0.0.0.0",
|
||||
"build": "nuxt generate --dotenv env/.env.prod",
|
||||
@@ -13,7 +13,7 @@
|
||||
"@element-plus/icons-vue": "^2.3.1",
|
||||
"@element-plus/nuxt": "^1.1.0",
|
||||
"@nuxtjs/tailwindcss": "^6.12.0",
|
||||
"@pinia/nuxt": "^0.7.0",
|
||||
"@pinia/nuxt": "0.8.0",
|
||||
"@tauri-apps/api": "^2.1.1",
|
||||
"@tauri-apps/cli": "^2.1.0",
|
||||
"@tauri-apps/plugin-autostart": "~2",
|
||||
@@ -26,7 +26,7 @@
|
||||
"@tauri-apps/plugin-window-state": "~2",
|
||||
"@types/lodash-es": "^4.17.12",
|
||||
"@vitejs/plugin-vue-jsx": "^4.1.0",
|
||||
"@vueuse/core": "^11.2.0",
|
||||
"@vueuse/core": "12.0.0",
|
||||
"archiver": "^7.0.1",
|
||||
"element-plus": "^2.8.7",
|
||||
"less": "^4.2.0",
|
||||
|
||||
+154
-150
@@ -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,16 +208,14 @@
|
||||
>
|
||||
分享联机相关配置
|
||||
</ElDropdownItem>
|
||||
<ElDropdownItem
|
||||
disabled
|
||||
>
|
||||
<ElDropdownItem disabled>
|
||||
<ElDivider class="!h-[2px] !m-0" />
|
||||
</ElDropdownItem>
|
||||
<ElDropdownItem
|
||||
:icon="SetUp"
|
||||
command="create_server"
|
||||
>
|
||||
{{ mainStore.enableCreateServer ? "我要联机" : "我要开服(自建)" }}
|
||||
自建服务器<ElTag size="small" class="ml-[5px]" :type="listenObj.server_thread_id.value ? 'success' : 'info'">{{ listenObj.server_thread_id.value ? "运行中" : "未运行" }}</ElTag>
|
||||
</ElDropdownItem>
|
||||
<ElDropdownItem
|
||||
:icon="Tools"
|
||||
@@ -418,6 +335,9 @@
|
||||
>
|
||||
刷新
|
||||
</ElButton>
|
||||
<ElTooltip content="打开内核缓存目录">
|
||||
<ElButton :icon="Folder" size="small" @click="handleOpenCache"></ElButton>
|
||||
</ElTooltip>
|
||||
</div>
|
||||
<ElSelect
|
||||
placeholder="请选择内核版本"
|
||||
@@ -562,8 +482,8 @@
|
||||
import { invoke } from "@tauri-apps/api/core";
|
||||
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 { QuestionFilled, Delete, List, UserFilled, Setting, Share, RefreshRight, Link, Tools, MagicStick, SetUp, Folder } from "@element-plus/icons-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";
|
||||
@@ -579,6 +499,7 @@
|
||||
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;
|
||||
|
||||
@@ -588,6 +509,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();
|
||||
@@ -598,16 +520,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: "-",
|
||||
@@ -650,6 +574,20 @@
|
||||
}
|
||||
};
|
||||
|
||||
const handleOpenCache = async () => {
|
||||
const cache_path = import.meta.env.VITE_CACHE_PATH;
|
||||
const resourceDir = await getResourceDir();
|
||||
const configPath = await join(resourceDir, cache_path);
|
||||
const isExists = await exists(cache_path, { baseDir: BaseDirectory.Resource });
|
||||
if (!isExists) {
|
||||
try {
|
||||
await mkdir(cache_path, { baseDir: BaseDirectory.Resource });
|
||||
} catch (err) {}
|
||||
}
|
||||
// console.error(configPath);
|
||||
await Command.create("explorer", [configPath]).execute();
|
||||
}
|
||||
|
||||
const handleDeleteServerUrl = (url: string) => {
|
||||
const newBasePeers = [...mainStore.basePeers];
|
||||
const idx = newBasePeers.indexOf(url);
|
||||
@@ -683,30 +621,32 @@
|
||||
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 (config.dhcp || mainStore.configStartEnable) {
|
||||
if (ipv4) {
|
||||
config.ipv4 = ipv4;
|
||||
await setTrayRunState(tray, true);
|
||||
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 (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: ${mainStore.config.ipv4}`);
|
||||
}
|
||||
if (ipv4) {
|
||||
mainStore.config.ipv4 = ipv4;
|
||||
await setTrayTooltip(tray, `IP: ${ipv4}`);
|
||||
}
|
||||
if (
|
||||
devName &&
|
||||
@@ -744,6 +684,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);
|
||||
@@ -752,6 +710,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;
|
||||
}
|
||||
};
|
||||
|
||||
@@ -964,18 +939,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();
|
||||
});
|
||||
@@ -984,7 +976,9 @@
|
||||
unListenAll();
|
||||
listenObj.unListenReleaseList && listenObj.unListenReleaseList();
|
||||
listenObj.unListenConfigStart && listenObj.unListenConfigStart();
|
||||
listenObj.unListenStartStopServer && listenObj.unListenStartStopServer();
|
||||
logsTimer && clearInterval(logsTimer);
|
||||
serverLogsTimer && clearInterval(serverLogsTimer);
|
||||
});
|
||||
|
||||
const getArgs = async () => {
|
||||
@@ -1017,24 +1011,6 @@
|
||||
}
|
||||
}
|
||||
|
||||
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 +1181,23 @@
|
||||
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;
|
||||
}
|
||||
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;
|
||||
// }
|
||||
}
|
||||
};
|
||||
|
||||
@@ -1312,6 +1289,7 @@
|
||||
}, 650);
|
||||
},
|
||||
() => {
|
||||
logsTimer && clearInterval(logsTimer);
|
||||
data.logVisible = false;
|
||||
}
|
||||
);
|
||||
@@ -1373,4 +1351,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>
|
||||
|
||||
+62
-14
@@ -13,7 +13,11 @@
|
||||
width="140"
|
||||
label="主机名"
|
||||
prop="hostname"
|
||||
></ElTableColumn>
|
||||
>
|
||||
<template #default="{row}">
|
||||
{{ (row.hostname || "").toLowerCase().includes('publicserver') ? (row.hostname || "").replace("PublicServer", "服务器") : (row.hostname || "-") }}
|
||||
</template>
|
||||
</ElTableColumn>
|
||||
<ElTableColumn
|
||||
sortable
|
||||
width="90"
|
||||
@@ -54,8 +58,8 @@
|
||||
<ElTableColumn
|
||||
sortable
|
||||
width="120"
|
||||
label="nat_type"
|
||||
prop="NAT类型"
|
||||
label="NAT类型"
|
||||
prop="nat_type"
|
||||
>
|
||||
<template #default="{ row }">
|
||||
{{ natMaps[row.nat_type.toLowerCase() as natKyes] || row.nat_type || "-" }}
|
||||
@@ -72,6 +76,16 @@
|
||||
prop="tunnel_proto"
|
||||
label="隧道协议"
|
||||
></ElTableColumn>
|
||||
<ElTableColumn
|
||||
sortable
|
||||
prop="rx_bytes"
|
||||
label="接收"
|
||||
></ElTableColumn>
|
||||
<ElTableColumn
|
||||
sortable
|
||||
prop="tx_bytes"
|
||||
label="传输"
|
||||
></ElTableColumn>
|
||||
</ElTable>
|
||||
</div>
|
||||
</div>
|
||||
@@ -79,7 +93,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;
|
||||
@@ -107,7 +123,7 @@
|
||||
};
|
||||
type natKyes = keyof typeof natMaps;
|
||||
|
||||
const data = reactive<{ member: any[] }>({
|
||||
const data = reactive<{ member: {hostname: string, cost: string, ipv4: string, lat_msg: string, loss_rate: string, nat_type: string}[] }>({
|
||||
member: []
|
||||
});
|
||||
|
||||
@@ -119,11 +135,35 @@
|
||||
["loss_rate", "丢包率"],
|
||||
["nat_type", "NAT类型"],
|
||||
["version", "版本"],
|
||||
["tunnel_proto", "隧道协议"]
|
||||
["tunnel_proto", "隧道协议"],
|
||||
['rx_bytes', '接收'],
|
||||
['tx_bytes', '传输']
|
||||
];
|
||||
|
||||
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_") {
|
||||
data.member = [];
|
||||
stopTimer();
|
||||
const [error] = await ElConfirmDanger("连接已断开,是否重新尝试?", "警告", {
|
||||
confirmButtonText: "重试",
|
||||
cancelButtonText: "关闭窗口"
|
||||
});
|
||||
if (!error) {
|
||||
await listenOutput();
|
||||
} else {
|
||||
const appWindow = getCurrentWindow();
|
||||
await appWindow.close();
|
||||
}
|
||||
return;
|
||||
}
|
||||
const peerInfo = parsePeerInfo(member);
|
||||
peerInfo.forEach(value => {
|
||||
if (value.cost === "Local") {
|
||||
@@ -133,20 +173,28 @@
|
||||
value.ipv4 = value.ipv4.split("/")[0];
|
||||
}
|
||||
});
|
||||
// console.error(peerInfo);
|
||||
// console.log(peerInfo)
|
||||
data.member = peerInfo;
|
||||
startTimer();
|
||||
};
|
||||
|
||||
let timer: NodeJS.Timeout | null = null;
|
||||
const startTimer = () => {
|
||||
timer && clearTimeout(timer);
|
||||
timer = setTimeout(() => {
|
||||
listenOutput();
|
||||
}, 1000);
|
||||
};
|
||||
|
||||
const stopTimer = () => {
|
||||
timer && clearTimeout(timer);
|
||||
timer = null;
|
||||
}
|
||||
|
||||
onMounted(async () => {
|
||||
listenOutput();
|
||||
timer = setInterval(() => {
|
||||
listenOutput();
|
||||
}, 1000 * 10);
|
||||
await listenOutput();
|
||||
});
|
||||
|
||||
onBeforeUnmount(() => {
|
||||
timer && clearInterval(timer);
|
||||
stopTimer();
|
||||
});
|
||||
</script>
|
||||
|
||||
@@ -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>
|
||||
Generated
+31
-36
@@ -18,8 +18,8 @@ importers:
|
||||
specifier: ^6.12.0
|
||||
version: 6.12.2(magicast@0.3.5)(rollup@4.25.0)
|
||||
'@pinia/nuxt':
|
||||
specifier: ^0.7.0
|
||||
version: 0.7.0(magicast@0.3.5)(rollup@4.25.0)(typescript@5.6.3)(vue@3.5.13(typescript@5.6.3))
|
||||
specifier: 0.8.0
|
||||
version: 0.8.0(magicast@0.3.5)(pinia@2.2.6(typescript@5.6.3)(vue@3.5.13(typescript@5.6.3)))(rollup@4.25.0)
|
||||
'@tauri-apps/api':
|
||||
specifier: ^2.1.1
|
||||
version: 2.1.1
|
||||
@@ -57,8 +57,8 @@ importers:
|
||||
specifier: ^4.1.0
|
||||
version: 4.1.0(vite@5.4.11(@types/node@22.9.0)(less@4.2.0)(terser@5.36.0))(vue@3.5.13(typescript@5.6.3))
|
||||
'@vueuse/core':
|
||||
specifier: ^11.2.0
|
||||
version: 11.2.0(vue@3.5.13(typescript@5.6.3))
|
||||
specifier: 12.0.0
|
||||
version: 12.0.0(typescript@5.6.3)
|
||||
archiver:
|
||||
specifier: ^7.0.1
|
||||
version: 7.0.1
|
||||
@@ -79,7 +79,7 @@ importers:
|
||||
version: 2.2.6(typescript@5.6.3)(vue@3.5.13(typescript@5.6.3))
|
||||
pinia-plugin-persistedstate:
|
||||
specifier: ^4.1.3
|
||||
version: 4.1.3(@pinia/nuxt@0.7.0(magicast@0.3.5)(rollup@4.25.0)(typescript@5.6.3)(vue@3.5.13(typescript@5.6.3)))(magicast@0.3.5)(pinia@2.2.6(typescript@5.6.3)(vue@3.5.13(typescript@5.6.3)))(rollup@4.25.0)
|
||||
version: 4.1.3(@pinia/nuxt@0.8.0(magicast@0.3.5)(pinia@2.2.6(typescript@5.6.3)(vue@3.5.13(typescript@5.6.3)))(rollup@4.25.0))(magicast@0.3.5)(pinia@2.2.6(typescript@5.6.3)(vue@3.5.13(typescript@5.6.3)))(rollup@4.25.0)
|
||||
postcss:
|
||||
specifier: ^8.4.38
|
||||
version: 8.4.49
|
||||
@@ -772,8 +772,10 @@ packages:
|
||||
resolution: {integrity: sha512-i0GV1yJnm2n3Yq1qw6QrUrd/LI9bE8WEBOTtOkpCXHHdyN3TAGgqAK/DAT05z4fq2x04cARXt2pDmjWjL92iTQ==}
|
||||
engines: {node: '>= 10.0.0'}
|
||||
|
||||
'@pinia/nuxt@0.7.0':
|
||||
resolution: {integrity: sha512-IAKRl7mQCrFKQtD8Z6EzOz5bQ/px0FdeyaB+70A3igkFzHzKVJVblLCjFwXPBC/IO0EwHuMRk/SMgwkUn82jwg==}
|
||||
'@pinia/nuxt@0.8.0':
|
||||
resolution: {integrity: sha512-BWPUKOg3KGnRSgz54x9IUzCKTqUxZx4UJezPRbRwY5BVt18rfiP4Cqq8kxtR8WWDZa5PTRJpx0Jxz+qyUdLvjQ==}
|
||||
peerDependencies:
|
||||
pinia: ^2.2.7
|
||||
|
||||
'@pkgjs/parseargs@0.11.0':
|
||||
resolution: {integrity: sha512-+1VkjdD0QBLPodGrJUeqarH8VAIvQODIbwh9XpP5Syisf7YoQgsJKPNFoqqLQlu+VQ/tVSshMR6loPMn8U+dPg==}
|
||||
@@ -1316,20 +1318,20 @@ packages:
|
||||
'@vue/shared@3.5.13':
|
||||
resolution: {integrity: sha512-/hnE/qP5ZoGpol0a5mDi45bOd7t3tjYJBjsgCsivow7D48cJeV5l05RD82lPqi7gRiphZM37rnhW1l6ZoCNNnQ==}
|
||||
|
||||
'@vueuse/core@11.2.0':
|
||||
resolution: {integrity: sha512-JIUwRcOqOWzcdu1dGlfW04kaJhW3EXnnjJJfLTtddJanymTL7lF1C0+dVVZ/siLfc73mWn+cGP1PE1PKPruRSA==}
|
||||
'@vueuse/core@12.0.0':
|
||||
resolution: {integrity: sha512-C12RukhXiJCbx4MGhjmd/gH52TjJsc3G0E0kQj/kb19H3Nt6n1CA4DRWuTdWWcaFRdlTe0npWDS942mvacvNBw==}
|
||||
|
||||
'@vueuse/core@9.13.0':
|
||||
resolution: {integrity: sha512-pujnclbeHWxxPRqXWmdkKV5OX4Wk4YeK7wusHqRwU0Q7EFusHoqNA/aPhB6KCh9hEqJkLAJo7bb0Lh9b+OIVzw==}
|
||||
|
||||
'@vueuse/metadata@11.2.0':
|
||||
resolution: {integrity: sha512-L0ZmtRmNx+ZW95DmrgD6vn484gSpVeRbgpWevFKXwqqQxW9hnSi2Ppuh2BzMjnbv4aJRiIw8tQatXT9uOB23dQ==}
|
||||
'@vueuse/metadata@12.0.0':
|
||||
resolution: {integrity: sha512-Yzimd1D3sjxTDOlF05HekU5aSGdKjxhuhRFHA7gDWLn57PRbBIh+SF5NmjhJ0WRgF3my7T8LBucyxdFJjIfRJQ==}
|
||||
|
||||
'@vueuse/metadata@9.13.0':
|
||||
resolution: {integrity: sha512-gdU7TKNAUVlXXLbaF+ZCfte8BjRJQWPCa2J55+7/h+yDtzw3vOoGQDRXzI6pyKyo6bXFT5/QoPE4hAknExjRLQ==}
|
||||
|
||||
'@vueuse/shared@11.2.0':
|
||||
resolution: {integrity: sha512-VxFjie0EanOudYSgMErxXfq6fo8vhr5ICI+BuE3I9FnX7ePllEsVrRQ7O6Q1TLgApeLuPKcHQxAXpP+KnlrJsg==}
|
||||
'@vueuse/shared@12.0.0':
|
||||
resolution: {integrity: sha512-3i6qtcq2PIio5i/vVYidkkcgvmTjCqrf26u+Fd4LhnbBmIT6FN8y6q/GJERp8lfcB9zVEfjdV0Br0443qZuJpw==}
|
||||
|
||||
'@vueuse/shared@9.13.0':
|
||||
resolution: {integrity: sha512-UrnhU+Cnufu4S6JLCPZnkWh0WwZGUp72ktOF2DFptMlOs3TOdVv8xJN53zhHGARmVOsz5KqOls09+J1NR6sBKw==}
|
||||
@@ -4526,13 +4528,12 @@ snapshots:
|
||||
std-env: 3.8.0
|
||||
ufo: 1.5.4
|
||||
uncrypto: 0.1.3
|
||||
unimport: 3.13.1(rollup@4.25.0)
|
||||
unimport: 3.13.3(rollup@4.25.0)
|
||||
untyped: 1.5.1
|
||||
transitivePeerDependencies:
|
||||
- magicast
|
||||
- rollup
|
||||
- supports-color
|
||||
- webpack-sources
|
||||
|
||||
'@nuxt/schema@3.14.1592(magicast@0.3.5)(rollup@4.25.0)':
|
||||
dependencies:
|
||||
@@ -4725,18 +4726,14 @@ snapshots:
|
||||
'@parcel/watcher-win32-ia32': 2.5.0
|
||||
'@parcel/watcher-win32-x64': 2.5.0
|
||||
|
||||
'@pinia/nuxt@0.7.0(magicast@0.3.5)(rollup@4.25.0)(typescript@5.6.3)(vue@3.5.13(typescript@5.6.3))':
|
||||
'@pinia/nuxt@0.8.0(magicast@0.3.5)(pinia@2.2.6(typescript@5.6.3)(vue@3.5.13(typescript@5.6.3)))(rollup@4.25.0)':
|
||||
dependencies:
|
||||
'@nuxt/kit': 3.14.159(magicast@0.3.5)(rollup@4.25.0)
|
||||
'@nuxt/kit': 3.14.1592(magicast@0.3.5)(rollup@4.25.0)
|
||||
pinia: 2.2.6(typescript@5.6.3)(vue@3.5.13(typescript@5.6.3))
|
||||
transitivePeerDependencies:
|
||||
- '@vue/composition-api'
|
||||
- magicast
|
||||
- rollup
|
||||
- supports-color
|
||||
- typescript
|
||||
- vue
|
||||
- webpack-sources
|
||||
|
||||
'@pkgjs/parseargs@0.11.0':
|
||||
optional: true
|
||||
@@ -5115,7 +5112,7 @@ snapshots:
|
||||
dependencies:
|
||||
'@babel/types': 7.26.0
|
||||
'@rollup/pluginutils': 5.1.3(rollup@4.25.0)
|
||||
'@vue/compiler-sfc': 3.5.12
|
||||
'@vue/compiler-sfc': 3.5.13
|
||||
ast-kit: 1.3.1
|
||||
local-pkg: 0.5.0
|
||||
magic-string-ast: 0.6.2
|
||||
@@ -5268,15 +5265,14 @@ snapshots:
|
||||
|
||||
'@vue/shared@3.5.13': {}
|
||||
|
||||
'@vueuse/core@11.2.0(vue@3.5.13(typescript@5.6.3))':
|
||||
'@vueuse/core@12.0.0(typescript@5.6.3)':
|
||||
dependencies:
|
||||
'@types/web-bluetooth': 0.0.20
|
||||
'@vueuse/metadata': 11.2.0
|
||||
'@vueuse/shared': 11.2.0(vue@3.5.13(typescript@5.6.3))
|
||||
vue-demi: 0.14.10(vue@3.5.13(typescript@5.6.3))
|
||||
'@vueuse/metadata': 12.0.0
|
||||
'@vueuse/shared': 12.0.0(typescript@5.6.3)
|
||||
vue: 3.5.13(typescript@5.6.3)
|
||||
transitivePeerDependencies:
|
||||
- '@vue/composition-api'
|
||||
- vue
|
||||
- typescript
|
||||
|
||||
'@vueuse/core@9.13.0(vue@3.5.13(typescript@5.6.3))':
|
||||
dependencies:
|
||||
@@ -5288,16 +5284,15 @@ snapshots:
|
||||
- '@vue/composition-api'
|
||||
- vue
|
||||
|
||||
'@vueuse/metadata@11.2.0': {}
|
||||
'@vueuse/metadata@12.0.0': {}
|
||||
|
||||
'@vueuse/metadata@9.13.0': {}
|
||||
|
||||
'@vueuse/shared@11.2.0(vue@3.5.13(typescript@5.6.3))':
|
||||
'@vueuse/shared@12.0.0(typescript@5.6.3)':
|
||||
dependencies:
|
||||
vue-demi: 0.14.10(vue@3.5.13(typescript@5.6.3))
|
||||
vue: 3.5.13(typescript@5.6.3)
|
||||
transitivePeerDependencies:
|
||||
- '@vue/composition-api'
|
||||
- vue
|
||||
- typescript
|
||||
|
||||
'@vueuse/shared@9.13.0(vue@3.5.13(typescript@5.6.3))':
|
||||
dependencies:
|
||||
@@ -7033,14 +7028,14 @@ snapshots:
|
||||
pify@4.0.1:
|
||||
optional: true
|
||||
|
||||
pinia-plugin-persistedstate@4.1.3(@pinia/nuxt@0.7.0(magicast@0.3.5)(rollup@4.25.0)(typescript@5.6.3)(vue@3.5.13(typescript@5.6.3)))(magicast@0.3.5)(pinia@2.2.6(typescript@5.6.3)(vue@3.5.13(typescript@5.6.3)))(rollup@4.25.0):
|
||||
pinia-plugin-persistedstate@4.1.3(@pinia/nuxt@0.8.0(magicast@0.3.5)(pinia@2.2.6(typescript@5.6.3)(vue@3.5.13(typescript@5.6.3)))(rollup@4.25.0))(magicast@0.3.5)(pinia@2.2.6(typescript@5.6.3)(vue@3.5.13(typescript@5.6.3)))(rollup@4.25.0):
|
||||
dependencies:
|
||||
'@nuxt/kit': 3.14.159(magicast@0.3.5)(rollup@4.25.0)
|
||||
deep-pick-omit: 1.2.1
|
||||
defu: 6.1.4
|
||||
destr: 2.0.3
|
||||
optionalDependencies:
|
||||
'@pinia/nuxt': 0.7.0(magicast@0.3.5)(rollup@4.25.0)(typescript@5.6.3)(vue@3.5.13(typescript@5.6.3))
|
||||
'@pinia/nuxt': 0.8.0(magicast@0.3.5)(pinia@2.2.6(typescript@5.6.3)(vue@3.5.13(typescript@5.6.3)))(rollup@4.25.0)
|
||||
pinia: 2.2.6(typescript@5.6.3)(vue@3.5.13(typescript@5.6.3))
|
||||
transitivePeerDependencies:
|
||||
- magicast
|
||||
@@ -7982,7 +7977,7 @@ snapshots:
|
||||
'@babel/plugin-syntax-import-meta': 7.10.4(@babel/core@7.26.0)
|
||||
'@babel/plugin-transform-typescript': 7.25.9(@babel/core@7.26.0)
|
||||
'@vue/babel-plugin-jsx': 1.2.5(@babel/core@7.26.0)
|
||||
'@vue/compiler-dom': 3.5.12
|
||||
'@vue/compiler-dom': 3.5.13
|
||||
kolorist: 1.8.0
|
||||
magic-string: 0.30.14
|
||||
vite: 5.4.11(@types/node@22.9.0)(less@4.2.0)(terser@5.36.0)
|
||||
|
||||
Generated
+5
-3
@@ -1176,7 +1176,7 @@ checksum = "0d6ef0072f8a535281e4876be788938b528e9a1d43900b82c2569af7da799125"
|
||||
|
||||
[[package]]
|
||||
name = "easytier-game"
|
||||
version = "1.2.6"
|
||||
version = "1.2.8"
|
||||
dependencies = [
|
||||
"log",
|
||||
"planif",
|
||||
@@ -1193,6 +1193,7 @@ dependencies = [
|
||||
"tauri-plugin-shell",
|
||||
"tauri-plugin-single-instance",
|
||||
"tauri-plugin-window-state",
|
||||
"tokio",
|
||||
"whoami",
|
||||
"windows 0.58.0",
|
||||
"zip",
|
||||
@@ -4782,15 +4783,16 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20"
|
||||
|
||||
[[package]]
|
||||
name = "tokio"
|
||||
version = "1.40.0"
|
||||
version = "1.41.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "e2b070231665d27ad9ec9b8df639893f46727666c6767db40317fbe920a5d998"
|
||||
checksum = "22cfb5bee7a6a52939ca9224d6ac897bb669134078daa8735560897f69de4d33"
|
||||
dependencies = [
|
||||
"backtrace",
|
||||
"bytes",
|
||||
"libc",
|
||||
"mio",
|
||||
"pin-project-lite",
|
||||
"signal-hook-registry",
|
||||
"socket2",
|
||||
"windows-sys 0.52.0",
|
||||
]
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
[package]
|
||||
name = "easytier-game"
|
||||
version = "1.2.6"
|
||||
version = "1.2.8"
|
||||
homepage = "https://github.com/EasyTier/EasyTier"
|
||||
repository = "https://github.com/EasyTier/EasytierGame"
|
||||
description = "A simple network initiator based on Easytier"
|
||||
@@ -40,6 +40,7 @@ planif = { git = "https://github.com/mattrobineau/planif", tag = "1.0.1" }
|
||||
whoami = "1.5.2"
|
||||
tauri-plugin-fs = "2"
|
||||
tauri-plugin-clipboard-manager = "2.0.2"
|
||||
tokio = { version = "1.41.1", features = ["process"] }
|
||||
# prost = "0.13"
|
||||
# prost-types = "0.13"
|
||||
|
||||
|
||||
@@ -8,7 +8,8 @@
|
||||
"member",
|
||||
"cidr",
|
||||
"advance",
|
||||
"tool"
|
||||
"tool",
|
||||
"server"
|
||||
],
|
||||
"permissions": [
|
||||
"core:default",
|
||||
|
||||
+60
-34
@@ -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};
|
||||
@@ -24,6 +21,8 @@ use windows::Win32::Foundation::VARIANT_BOOL;
|
||||
use windows::Win32::System::Com::*;
|
||||
use windows::Win32::System::TaskScheduler::*;
|
||||
|
||||
use tokio::process::Command as tokioCommand;
|
||||
|
||||
// 定义GitHub Release的结构体
|
||||
#[derive(Debug, Deserialize)]
|
||||
pub struct Release {
|
||||
@@ -133,24 +132,41 @@ struct MyResponse {
|
||||
}
|
||||
|
||||
#[tauri::command(rename_all = "snake_case")]
|
||||
fn get_members_by_cli() -> String {
|
||||
async fn get_members_by_cli() -> String {
|
||||
let cli_path = get_tool_exe_path(String::from("\\easytier\\easytier-cli.exe"));
|
||||
match Command::new(&cli_path)
|
||||
match tokioCommand::new(&cli_path)
|
||||
.arg("peer")
|
||||
.arg("list")
|
||||
.creation_flags(0x08000000)
|
||||
.output()
|
||||
.output().await
|
||||
{
|
||||
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 +193,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 +253,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 +281,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 +552,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 +619,6 @@ pub fn run() {
|
||||
|
||||
Ok(())
|
||||
})
|
||||
.manage(stop_signal_clone)
|
||||
.invoke_handler(tauri::generate_handler![
|
||||
run_command,
|
||||
stop_command,
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
{
|
||||
"$schema": "../node_modules/@tauri-apps/cli/config.schema.json",
|
||||
"productName": "easytier-game",
|
||||
"version": "1.2.6",
|
||||
"version": "1.2.8",
|
||||
"identifier": "com.tauri.easytier-game",
|
||||
|
||||
"build": {
|
||||
@@ -13,7 +13,7 @@
|
||||
"app": {
|
||||
"windows": [
|
||||
{
|
||||
"title": "easytier-game 1.2.6",
|
||||
"title": "easytier-game 1.2.8",
|
||||
"label": "main",
|
||||
"minWidth": 340,
|
||||
"width": 340,
|
||||
|
||||
@@ -14,3 +14,11 @@
|
||||
2. 运行easytier-game安装目录下的 easytier/clear_local_data.bat (需要管理员权限) 输入y确认，清除本地存储数据
|
||||
|
||||
3. 删除easytierGame文件夹
|
||||
|
||||
|
||||
[没有服务器，怎么自建服务]
|
||||
1. 点击 启动联机 按钮旁边的箭头 选择自建服务 设置好端口号后 点击启动服务器
|
||||
|
||||
2. 搜索一下 openFrp mossFrp sakurafrp 等 将你的本地服务通过它（们）代理到公网
|
||||
|
||||
3. 将代理之后的地址发给别人，他们就可以通过这个加入你的服务了
|
||||
+17
-7
@@ -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"]
|
||||
|
||||
@@ -29,6 +29,8 @@ export const ElConfirmDanger = (
|
||||
}
|
||||
return ATJ(
|
||||
ElMessageBox.confirm(message, title, {
|
||||
closeOnClickModal: false, // 点击遮罩层不关闭弹窗
|
||||
closeOnPressEscape: false, // 按下Esc键不关闭弹窗
|
||||
cancelButtonText,
|
||||
confirmButtonText,
|
||||
confirmButtonClass: "el-button--danger"
|
||||
@@ -63,6 +65,8 @@ export const ElConfirmSucces = (
|
||||
}
|
||||
return ATJ(
|
||||
ElMessageBox.confirm(message, title, {
|
||||
closeOnClickModal: false, // 点击遮罩层不关闭弹窗
|
||||
closeOnPressEscape: false, // 按下Esc键不关闭弹窗
|
||||
cancelButtonText,
|
||||
confirmButtonText,
|
||||
confirmButtonClass: "el-button--success"
|
||||
@@ -97,6 +101,8 @@ export const ElConfirmPrimary = (
|
||||
}
|
||||
return ATJ(
|
||||
ElMessageBox.confirm(message, title, {
|
||||
closeOnClickModal: false, // 点击遮罩层不关闭弹窗
|
||||
closeOnPressEscape: false, // 按下Esc键不关闭弹窗
|
||||
cancelButtonText,
|
||||
confirmButtonText,
|
||||
confirmButtonClass: "el-button--primary"
|
||||
|
||||
@@ -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");
|
||||
|
||||
|
||||
@@ -6,7 +6,7 @@ const releaseDir = "./src-tauri/target/release";
|
||||
const releaseDirEasytier = `${releaseDir}/easytier/`;
|
||||
const releaseExe = `${releaseDir}/easytier-game.exe`;
|
||||
const releaseHelp = `${releaseDir}/帮助.txt`;
|
||||
const deleteEasytierFiles = ["logs/", "guiLogs/"];
|
||||
const deleteEasytierFiles = ["logs/", "guiLogs/", "cache/"];
|
||||
const pkg = require("./package.json");
|
||||
const fileName = `easytier-game_windows_x86_64_${pkg.version}.zip`; // 发布包格式
|
||||
const releaseZipDir = "./release";
|
||||
|
||||
Reference in New Issue
Block a user