mirror of
https://github.com/EasyTier/EasytierGame.git
synced 2026-09-20 03:21:59 +00:00
Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
bc66a13fbf | ||
|
|
89913eeebc | ||
|
|
1f344f1d65 | ||
|
|
fb5e5bfff0 | ||
|
|
70c3217ab5 | ||
|
|
e91bd07ce8 | ||
|
|
9f63d9bf2e | ||
|
|
94968401fc | ||
|
|
86adc2c40b | ||
|
|
6b373a3ed6 | ||
|
|
fa480a8162 | ||
|
|
0da1ab85cd | ||
|
|
b1d1144e78 | ||
|
|
d71b93c1a8 | ||
|
|
9e83ca7d91 | ||
|
|
c10a3ae22f | ||
|
|
6f5e0a85f8 | ||
|
|
ae42baa73a | ||
|
|
05fe46858d | ||
|
|
a438c48fdc |
@@ -10,6 +10,7 @@ dist
|
||||
.idea
|
||||
.vscode
|
||||
release
|
||||
target
|
||||
|
||||
src-tauri/easytier/logs
|
||||
src-tauri/easytier/tool/ResourcesExtract.exe
|
||||
|
||||
+8
-1
@@ -39,7 +39,7 @@ html.dark body {
|
||||
}
|
||||
|
||||
.full-label .el-form-item__label {
|
||||
width: 100%;
|
||||
width: 100%!important;
|
||||
padding-right: 0;
|
||||
}
|
||||
|
||||
@@ -50,6 +50,13 @@ html.dark body {
|
||||
flex: 1;
|
||||
}
|
||||
|
||||
.el-select__selection {
|
||||
/* display: none!important; */
|
||||
min-height: 20px!important;
|
||||
flex-wrap: nowrap!important;
|
||||
overflow: hidden!important;
|
||||
}
|
||||
|
||||
.el-table {
|
||||
font-size: 12px !important;
|
||||
}
|
||||
|
||||
@@ -1,12 +0,0 @@
|
||||
pnpm run build
|
||||
rustup default nightly
|
||||
@REM rem 使用rust nightly构建支持win7的版本,请先将根目录的windows.0.48.5 放入以下目录
|
||||
@REM rem C:\Program Files\Microsoft Visual Studio\2022\Community\VC\Tools\MSVC\你自己的版本\lib\x64
|
||||
@REM rem C:\Program Files\Microsoft Visual Studio\2022\Community\VC\Tools\MSVC\你自己的版本\lib\x86
|
||||
@REM rem C:\Program Files\Microsoft Visual Studio\2022\Community\VC\Tools\MSVC\你自己的版本\atlmfc\lib\x64
|
||||
@REM rem C:\Program Files\Microsoft Visual Studio\2022\Community\VC\Tools\MSVC\你自己的版本\atlmfc\lib\x86
|
||||
pnpm tauri build -- -Z build-std --target x86_64-win7-windows-msvc
|
||||
rustup default stable
|
||||
pnpm tauri build
|
||||
pnpm run release
|
||||
pnpm run release-win7
|
||||
+14
-23
@@ -5,9 +5,9 @@ import { uniq, intersection, isNil } from "lodash-es";
|
||||
import { bounce } from "~/utils";
|
||||
|
||||
const b = bounce(600);
|
||||
export type ConfigServerUrlType = Array<string> | string | null | undefined | null;
|
||||
export type ConfigServerUrlType = Array<string>;
|
||||
|
||||
export const updateConfigJsonBounce = (configJsonSeverUrl?: ConfigServerUrlType) => {
|
||||
export const updateConfigJsonBounce = (configJsonSeverUrl?: ConfigServerUrlType | null) => {
|
||||
b(async () => {
|
||||
const mainStore = useMainStore();
|
||||
if (mainStore.createConfigInEasytier) {
|
||||
@@ -16,19 +16,20 @@ export const updateConfigJsonBounce = (configJsonSeverUrl?: ConfigServerUrlType)
|
||||
});
|
||||
};
|
||||
|
||||
export const updateConfigJson = async (configJsonSeverUrl?: ConfigServerUrlType) => {
|
||||
export const updateConfigJson = async (configJsonSeverUrl?: ConfigServerUrlType | null) => {
|
||||
const mainStore = useMainStore();
|
||||
const path = import.meta.env.VITE_CONFIG_FILE_NAME;
|
||||
if (isNil(configJsonSeverUrl)) {
|
||||
configJsonSeverUrl = [];
|
||||
}
|
||||
const isArray = Array.isArray(configJsonSeverUrl);
|
||||
const isString = typeof configJsonSeverUrl === "string";
|
||||
if(typeof(configJsonSeverUrl) == 'string') {
|
||||
configJsonSeverUrl = [configJsonSeverUrl];
|
||||
}
|
||||
configJsonSeverUrl = configJsonSeverUrl || [];
|
||||
try {
|
||||
const {
|
||||
proxyNetworks,
|
||||
autoStart,
|
||||
connectAfterStart,
|
||||
saveErrorLog,
|
||||
serverUrl,
|
||||
enableCustomListener,
|
||||
@@ -37,26 +38,16 @@ export const updateConfigJson = async (configJsonSeverUrl?: ConfigServerUrlType)
|
||||
acceptDNS,
|
||||
enablePortForward,
|
||||
portForwardData,
|
||||
tcpWhitelist,
|
||||
udpWhitelist,
|
||||
tcpWhitelistEnable,
|
||||
udpWhitelistEnable,
|
||||
...otherConfig
|
||||
} = mainStore.config;
|
||||
let writeServerUrl: Array<string> | string = serverUrl;
|
||||
let writeServerUrl: Array<string> = serverUrl;
|
||||
let writeCustomListenerData: Array<string> = (customListenerData || "").split("\n");
|
||||
if (isArray) {
|
||||
writeServerUrl = intersection(
|
||||
uniq([serverUrl, ...configJsonSeverUrl]).filter(boolean => boolean),
|
||||
mainStore.basePeers
|
||||
);
|
||||
}
|
||||
if (isString && configJsonSeverUrl) {
|
||||
writeServerUrl = intersection(
|
||||
uniq([serverUrl, ...(configJsonSeverUrl as string).split(",")]).filter(boolean => boolean),
|
||||
mainStore.basePeers
|
||||
).join(",");
|
||||
}
|
||||
|
||||
writeServerUrl = intersection(
|
||||
uniq([...serverUrl, ...configJsonSeverUrl]).filter(boolean => boolean),
|
||||
mainStore.basePeers
|
||||
);
|
||||
|
||||
await writeTextFile(
|
||||
path,
|
||||
JSON.stringify({ serverUrl: writeServerUrl, enableCustomListener, customListenerData: writeCustomListenerData, ...otherConfig }, null, 4),
|
||||
|
||||
@@ -31,6 +31,12 @@ export const getServerArgs = () => {
|
||||
if (networkSecret) {
|
||||
args.push("--network-secret", networkSecret);
|
||||
}
|
||||
if (mainStore.serverConfig.ipv6PublicAddrProvider) {
|
||||
args.push("--ipv6-public-addr-provider", "true");
|
||||
}
|
||||
if (mainStore.serverConfig.disableRelayData) {
|
||||
args.push("--disable-relay-data", "true");
|
||||
}
|
||||
|
||||
return args;
|
||||
};
|
||||
|
||||
+7
-7
@@ -22,7 +22,7 @@ async function toggleVisibility() {
|
||||
}
|
||||
}
|
||||
|
||||
export async function useTray(init: boolean = false, beforExit: Function, handleConnection: Function, handleReconnect: Function) {
|
||||
export async function useTray(init: boolean = false, beforExit: Function, handleConnection: Function, handleReconnect: Function, handleNodesList: Function) {
|
||||
let tray;
|
||||
try {
|
||||
tray = await TrayIcon.getById(DEFAULT_TRAY_NAME);
|
||||
@@ -31,7 +31,7 @@ export async function useTray(init: boolean = false, beforExit: Function, handle
|
||||
tooltip: `EasyTierGame\n${pkg.version}`,
|
||||
title: `EasyTierGame\n${pkg.version}`,
|
||||
id: DEFAULT_TRAY_NAME,
|
||||
menu: await Menu.new({ id: "main", items: await generateMenuItem(beforExit, handleConnection, handleReconnect) }),
|
||||
menu: await Menu.new({ id: "main", items: await generateMenuItem(beforExit, handleConnection, handleReconnect, handleNodesList) }),
|
||||
action: async e => {
|
||||
toggleVisibility();
|
||||
}
|
||||
@@ -45,20 +45,20 @@ export async function useTray(init: boolean = false, beforExit: Function, handle
|
||||
if (init) {
|
||||
tray.setTooltip(`EasyTierGame\n${pkg.version}`);
|
||||
tray.setShowMenuOnLeftClick(false);
|
||||
tray.setMenu(await Menu.new({ id: "main", items: await generateMenuItem(beforExit, handleConnection, handleReconnect) }));
|
||||
tray.setMenu(await Menu.new({ id: "main", items: await generateMenuItem(beforExit, handleConnection, handleReconnect, handleNodesList) }));
|
||||
}
|
||||
|
||||
return tray;
|
||||
}
|
||||
|
||||
export async function generateMenuItem(beforExit: Function, handleConnection: Function, handleReconnect: Function) {
|
||||
export async function generateMenuItem(beforExit: Function, handleConnection: Function, handleReconnect: Function, handleNodesList: Function) {
|
||||
return [
|
||||
await MenuItemShow("显示 / 隐藏"),
|
||||
await MenuItemExchangeConnection("联机 / 断开", handleConnection),
|
||||
await MenuItemReconnect("重新联机", handleReconnect),
|
||||
await MenuItemTheme(),
|
||||
await PredefinedMenuItem.new({ item: "Separator" }),
|
||||
await MenuItemPublicPeers(),
|
||||
await MenuItemPublicPeers(handleNodesList),
|
||||
await PredefinedMenuItem.new({ item: "Separator" }),
|
||||
await MenuItemExit("退出", beforExit)
|
||||
];
|
||||
@@ -87,12 +87,12 @@ export async function MenuItemExit(text: string, beforExit: Function) {
|
||||
});
|
||||
}
|
||||
|
||||
export async function MenuItemPublicPeers() {
|
||||
export async function MenuItemPublicPeers(handleNodesList: Function) {
|
||||
return await MenuItem.new({
|
||||
id: "publicPeers",
|
||||
text: "公共节点",
|
||||
action: async () => {
|
||||
await open(import.meta.env.VITE_PUBLIC_PEERS_URL);
|
||||
await handleNodesList();
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
+26
-23
@@ -3,7 +3,7 @@
|
||||
"private": true,
|
||||
"author": "leizi97",
|
||||
"description": "A simple network initiator based on Easytier",
|
||||
"version": "1.4.8",
|
||||
"version": "1.5.5",
|
||||
"scripts": {
|
||||
"dev": "nuxt dev --dotenv env/.env.dev --host 0.0.0.0",
|
||||
"build": "nuxt generate --dotenv env/.env.prod",
|
||||
@@ -11,32 +11,35 @@
|
||||
"release-win7": "node zip.js win7"
|
||||
},
|
||||
"devDependencies": {
|
||||
"@element-plus/icons-vue": "^2.3.1",
|
||||
"@element-plus/icons-vue": "2.3.2",
|
||||
"@element-plus/nuxt": "1.1.4",
|
||||
"@nuxtjs/tailwindcss": "6.13.2",
|
||||
"@pinia/nuxt": "0.11.1",
|
||||
"@tauri-apps/api": "2.7.0",
|
||||
"@tauri-apps/cli": "2.7.1",
|
||||
"@tauri-apps/plugin-cli": "2.4.0",
|
||||
"@tauri-apps/plugin-clipboard-manager": "2.3.0",
|
||||
"@tauri-apps/plugin-dialog": "2.3.1",
|
||||
"@tauri-apps/plugin-fs": "2.4.1",
|
||||
"@tauri-apps/plugin-log": "2.6.0",
|
||||
"@tauri-apps/plugin-shell": "2.3.0",
|
||||
"@tauri-apps/plugin-window-state": "2.4.0",
|
||||
"@types/lodash-es": "^4.17.12",
|
||||
"@vitejs/plugin-vue-jsx": "5.0.1",
|
||||
"@oxc-minify/binding-win32-x64-msvc": "^0.107.0",
|
||||
"@oxc-parser/binding-win32-x64-msvc": "^0.107.0",
|
||||
"@oxc-transform/binding-win32-x64-msvc": "^0.107.0",
|
||||
"@pinia/nuxt": "0.11.2",
|
||||
"@tauri-apps/api": "2.11.0",
|
||||
"@tauri-apps/cli": "2.11.1",
|
||||
"@tauri-apps/plugin-cli": "2.4.1",
|
||||
"@tauri-apps/plugin-clipboard-manager": "2.3.2",
|
||||
"@tauri-apps/plugin-dialog": "2.7.1",
|
||||
"@tauri-apps/plugin-fs": "2.5.1",
|
||||
"@tauri-apps/plugin-log": "2.8.0",
|
||||
"@tauri-apps/plugin-shell": "2.3.5",
|
||||
"@tauri-apps/plugin-window-state": "2.4.1",
|
||||
"@types/lodash-es": "4.17.12",
|
||||
"@vitejs/plugin-vue-jsx": "5.1.1",
|
||||
"@vueuse/core": "12.7.0",
|
||||
"archiver": "^7.0.1",
|
||||
"element-plus": "2.10.7",
|
||||
"archiver": "7.0.1",
|
||||
"element-plus": "2.13.0",
|
||||
"less": "4.2.1",
|
||||
"lodash-es": "^4.17.21",
|
||||
"nuxt": "3.18.1",
|
||||
"pinia": "3.0.3",
|
||||
"pinia-plugin-persistedstate": "4.4.1",
|
||||
"postcss": "^8.4.38",
|
||||
"prettier": "3.6.2",
|
||||
"prettier-plugin-tailwindcss": "0.6.14"
|
||||
"lodash-es": "4.17.21",
|
||||
"nuxt": "3.20.2",
|
||||
"pinia": "3.0.4",
|
||||
"pinia-plugin-persistedstate": "4.7.1",
|
||||
"postcss": "8.4.49",
|
||||
"prettier": "3.7.4",
|
||||
"prettier-plugin-tailwindcss": "0.7.2"
|
||||
},
|
||||
"dependencies": {
|
||||
"is-ip": "^5.0.1"
|
||||
|
||||
+49
-3
@@ -37,6 +37,15 @@
|
||||
</ElButton>
|
||||
</div>
|
||||
<div><ElCheckbox v-model="mainStore.config.enablePreventSleep">防止系统休眠(比如:屏幕会一直亮着)</ElCheckbox></div>
|
||||
<div class="flex flex-nowrap items-center gap-[5px]">
|
||||
<ElCheckbox v-model="mainStore.config.enableUdpBroadcastRelay">Windows UDP 广播中继</ElCheckbox>
|
||||
<ElTooltip
|
||||
content="开启后,虚拟网络内的其他设备可以接收到本机发出的 UDP 广播包,让依赖局域网广播的应用(如局域网游戏发现、DLNA 投屏)在虚拟网络中正常工作"
|
||||
>
|
||||
<ElIcon><QuestionFilled /></ElIcon>
|
||||
</ElTooltip>
|
||||
<CoreVersionWarning version="2.6.4" />
|
||||
</div>
|
||||
<div class="flex flex-nowrap items-center gap-[5px]">
|
||||
<ElCheckbox v-model="mainStore.config.latencyfirst">使用低延迟模式</ElCheckbox>
|
||||
<ElTooltip content="弱网环境下可能会导致网络延迟延迟忽高忽低">
|
||||
@@ -98,14 +107,22 @@
|
||||
<CoreVersionWarning version="2.3.1" />
|
||||
</div>
|
||||
<ElDivider />
|
||||
<div class="flex w-full flex-nowrap items-center gap-[5px] mb-[3px]">
|
||||
<div class="mb-[3px] flex w-full flex-nowrap items-center gap-[5px]">
|
||||
<ElCheckbox v-model="mainStore.config.tcpWhitelistEnable">TCP端口白名单</ElCheckbox>
|
||||
<ElInput class="flex-1" v-model="mainStore.config.tcpWhitelist" placeholder="支持单个端口(80)和范围(8000-9000)" />
|
||||
<ElInput
|
||||
class="flex-1"
|
||||
v-model="mainStore.config.tcpWhitelist"
|
||||
placeholder="支持单个端口(80)和范围(8000-9000)"
|
||||
/>
|
||||
<CoreVersionWarning version="2.4.2" />
|
||||
</div>
|
||||
<div class="flex w-full flex-nowrap items-center gap-[5px]">
|
||||
<ElCheckbox v-model="mainStore.config.udpWhitelistEnable">UDP端口白名单</ElCheckbox>
|
||||
<ElInput class="flex-1" v-model="mainStore.config.udpWhitelist" placeholder="支持单个端口(53)和范围(5000-6000)" />
|
||||
<ElInput
|
||||
class="flex-1"
|
||||
v-model="mainStore.config.udpWhitelist"
|
||||
placeholder="支持单个端口(53)和范围(5000-6000)"
|
||||
/>
|
||||
<CoreVersionWarning version="2.4.2" />
|
||||
</div>
|
||||
<div class="flex items-center gap-[10px]">
|
||||
@@ -352,6 +369,35 @@
|
||||
打开日志目录
|
||||
</ElButton>
|
||||
</div>
|
||||
<ElDivider />
|
||||
<div class="flex flex-nowrap items-center gap-[5px]">
|
||||
<ElCheckbox v-model="mainStore.config.enableUpnp">UPnP 端口映射</ElCheckbox>
|
||||
<ElTooltip content="自动向路由器请求端口映射,默认开启,启动时无需额外配置">
|
||||
<ElIcon><QuestionFilled /></ElIcon>
|
||||
</ElTooltip>
|
||||
<CoreVersionWarning version="2.6.2" />
|
||||
</div>
|
||||
<div class="flex flex-nowrap items-center gap-[5px]">
|
||||
<ElCheckbox v-model="mainStore.config.ipv6PublicAddrProvider">公网 IPv6 地址前缀提供</ElCheckbox>
|
||||
<ElTooltip content="持有公网 IPv6 前缀的节点可开启,让同网络下其他节点自动获取独立公网地址">
|
||||
<ElIcon><QuestionFilled /></ElIcon>
|
||||
</ElTooltip>
|
||||
<CoreVersionWarning version="2.6.2" />
|
||||
</div>
|
||||
<div class="flex flex-nowrap items-center gap-[5px]">
|
||||
<ElCheckbox v-model="mainStore.config.ipv6PublicAddrAuto">公网 IPv6 地址自动获取</ElCheckbox>
|
||||
<ElTooltip content="从持有公网 IPv6 前缀的提供者节点自动获取独立公网地址">
|
||||
<ElIcon><QuestionFilled /></ElIcon>
|
||||
</ElTooltip>
|
||||
<CoreVersionWarning version="2.6.2" />
|
||||
</div>
|
||||
<div class="flex flex-nowrap items-center gap-[5px]">
|
||||
<ElCheckbox v-model="mainStore.config.disableRelayData">禁用 Relay 数据转发</ElCheckbox>
|
||||
<ElTooltip content="禁止节点转发 relay 数据流量而保留控制面功能,适用于不希望本节点承担中继带宽的场景">
|
||||
<ElIcon><QuestionFilled /></ElIcon>
|
||||
</ElTooltip>
|
||||
<CoreVersionWarning version="2.6.3" />
|
||||
</div>
|
||||
</div>
|
||||
</template>
|
||||
<script setup lang="ts">
|
||||
|
||||
+2
-11
@@ -69,7 +69,7 @@
|
||||
data.isRunning = true;
|
||||
const [error, member] = await ATJ(invoke<string>("get_route_by_cli"));
|
||||
data.isRunning = false;
|
||||
// if(!member) return;
|
||||
if(!member) return;
|
||||
if (error) {
|
||||
data.route = [];
|
||||
return "";
|
||||
@@ -79,16 +79,7 @@
|
||||
await listenOutput();
|
||||
return;
|
||||
}
|
||||
const routeInfo = parseCliInfo(member);
|
||||
routeInfo.forEach(value => {
|
||||
if (value.cost === "Local") {
|
||||
value.cost = "本机";
|
||||
}
|
||||
if (value.ipv4 && value.ipv4.includes("/")) {
|
||||
value.ipv4 = value.ipv4.split("/")[0];
|
||||
}
|
||||
});
|
||||
data.route = routeInfo;
|
||||
data.route = JSON.parse(member);
|
||||
};
|
||||
|
||||
const listenStart = async () => {
|
||||
|
||||
+193
-82
@@ -45,7 +45,7 @@
|
||||
</div>
|
||||
<ElTooltip content="请先停止自建服务和联机后再使用,否则内核被占用的情况下,无法进行内核更换">
|
||||
<ElBadge
|
||||
badge-class="!text-[9px] cursor-pointer"
|
||||
badge-class="!text-[9px] cursor-pointer ml-auto"
|
||||
:hidden="!haveNewCoreVersion"
|
||||
:offset="[-5, 6]"
|
||||
@click.stop="handleCoreManagement"
|
||||
@@ -67,7 +67,11 @@
|
||||
</template>
|
||||
<ElSelect
|
||||
allow-create
|
||||
:reserve-keyword="false"
|
||||
filterable
|
||||
multiple
|
||||
collapse-tags
|
||||
collapse-tags-tooltip
|
||||
placeholder="请选择服务器地址"
|
||||
default-first-option
|
||||
v-model="mainStore.config.serverUrl"
|
||||
@@ -75,14 +79,13 @@
|
||||
@change="handleServerUrlChange"
|
||||
>
|
||||
<template #prefix>
|
||||
<div :class="mainStore.config.protocol && mainStore.config.protocol.length > 1 ? 'w-[120px]' : 'w-[80px]'">
|
||||
<div :class="mainStore.config.protocol && mainStore.config.protocol.length > 1 ? 'w-[110px]' : 'w-[80px]'">
|
||||
<ElSelect
|
||||
placeholder="协议"
|
||||
multiple
|
||||
collapse-tags
|
||||
@click.stop
|
||||
v-model="mainStore.config.protocol"
|
||||
@change="handleServerUrlChange"
|
||||
>
|
||||
<ElOption
|
||||
v-for="item in protocols"
|
||||
@@ -99,7 +102,7 @@
|
||||
type="primary"
|
||||
size="small"
|
||||
underline="never"
|
||||
@click.stop="open(publicPeersLink)"
|
||||
@click.stop="handleShowPublicServersDialog"
|
||||
>
|
||||
其他公共服务器
|
||||
</ElLink>
|
||||
@@ -334,6 +337,12 @@
|
||||
<ElDivider class="!m-0 !h-[2px]" />
|
||||
</ElDropdownItem>
|
||||
<ElDropdownItem
|
||||
command="cidr"
|
||||
:icon="Share"
|
||||
>
|
||||
子网代理
|
||||
</ElDropdownItem>
|
||||
<!-- <ElDropdownItem
|
||||
command="import_config"
|
||||
:icon="Link"
|
||||
>
|
||||
@@ -344,7 +353,7 @@
|
||||
:icon="Share"
|
||||
>
|
||||
分享联机配置
|
||||
</ElDropdownItem>
|
||||
</ElDropdownItem> -->
|
||||
<ElDropdownItem
|
||||
command="reconnect"
|
||||
:icon="RefreshRight"
|
||||
@@ -403,21 +412,32 @@
|
||||
开机自启
|
||||
</ElCheckbox>
|
||||
</ElTooltip>
|
||||
<div>
|
||||
<ElButton
|
||||
@click="handleShowCidrDialog"
|
||||
:icon="Share"
|
||||
size="small"
|
||||
<div class="flex items-center gap-[0_2px]">
|
||||
<ElDropdown
|
||||
@command="handleStartCommand"
|
||||
trigger="click"
|
||||
:show-arrow="false"
|
||||
>
|
||||
子网代理
|
||||
</ElButton>
|
||||
<ElButton
|
||||
@click="handleShowAdvanceDialog"
|
||||
:icon="Setting"
|
||||
size="small"
|
||||
>
|
||||
高级选项
|
||||
</ElButton>
|
||||
<ElButton
|
||||
:icon="Share"
|
||||
size="small"
|
||||
>
|
||||
分享/导入
|
||||
</ElButton>
|
||||
<template #dropdown>
|
||||
<el-dropdown-item command="share_config">分享联机配置</el-dropdown-item>
|
||||
<el-dropdown-item command="import_config">导入联机配置</el-dropdown-item>
|
||||
</template>
|
||||
</ElDropdown>
|
||||
<div>
|
||||
<ElButton
|
||||
@click="handleShowAdvanceDialog"
|
||||
:icon="Setting"
|
||||
size="small"
|
||||
>
|
||||
高级选项
|
||||
</ElButton>
|
||||
</div>
|
||||
</div>
|
||||
<div class="flex items-center gap-[0_5px]">
|
||||
<div>
|
||||
@@ -780,7 +800,7 @@
|
||||
import { updateConfigJson, updateConfigJsonBounce } from "~/composables/configJson";
|
||||
import { writeText, readText } from "@tauri-apps/plugin-clipboard-manager";
|
||||
import { sortedUniq, uniq } from "lodash-es";
|
||||
import { addQQGroup, supportProtocols, preventSleep, stopPreventSleep, ATJ, copyText, isValidWindowsFileName } from "~/utils";
|
||||
import { addQQGroup, supportProtocols, preventSleep, stopPreventSleep, ATJ, copyText, isValidWindowsFileName, mixedArray } from "~/utils";
|
||||
import { ElConfirmDanger, ElConfirmPrimary } from "~/utils/element";
|
||||
import { getServerArgs } from "@/composables/server";
|
||||
import { isIPv6 } from "is-ip";
|
||||
@@ -802,6 +822,9 @@
|
||||
},
|
||||
async () => {
|
||||
await handleReconnect();
|
||||
},
|
||||
async () => {
|
||||
await handleShowPublicServersDialog();
|
||||
}
|
||||
);
|
||||
|
||||
@@ -815,6 +838,7 @@
|
||||
advanceVisible: false,
|
||||
toolVisible: false,
|
||||
gameListVisible: false,
|
||||
nodesListVisible: false,
|
||||
serverVisible: false,
|
||||
winipBcPid: 0, //WinIPBroadcast进程id
|
||||
winipBcStart: false,
|
||||
@@ -828,7 +852,7 @@
|
||||
startLoading: false,
|
||||
isStart: false,
|
||||
connectionSuccess: false,
|
||||
configJsonSeverUrl: "" // 本地保存一次,用于回填config.json
|
||||
configJsonSeverUrl: [] // 本地保存一次,用于回填config.json
|
||||
});
|
||||
|
||||
const configStart = reactive<{ list: Array<{ path: string; name: string }>; [key: string]: any }>({
|
||||
@@ -939,32 +963,43 @@
|
||||
const newBasePeers = [...mainStore.basePeers];
|
||||
const idx = newBasePeers.indexOf(url);
|
||||
if (idx >= 0) {
|
||||
if (mainStore.config.serverUrl === url) {
|
||||
mainStore.config.serverUrl = "";
|
||||
const selectIdx = mainStore.config.serverUrl.indexOf(url);
|
||||
if (selectIdx >= 0) {
|
||||
mainStore.config.serverUrl.splice(selectIdx, 1);
|
||||
}
|
||||
newBasePeers.splice(idx, 1);
|
||||
}
|
||||
mainStore.basePeers = uniq([...newBasePeers]);
|
||||
if (mainStore.basePeers.length > 0) {
|
||||
mainStore.config.serverUrl = mainStore.basePeers[0];
|
||||
if (mainStore.basePeers.length > 0 && mainStore.config.serverUrl.length <= 0) {
|
||||
mainStore.config.serverUrl = [mainStore.basePeers[0]];
|
||||
}
|
||||
};
|
||||
|
||||
const handleServerUrlChange = () => {
|
||||
let inputProtocols: string | null = null;
|
||||
let inputProtocols: string[] = [];
|
||||
// console.log(mainStore.config.serverUrl);
|
||||
for (const p of protocols) {
|
||||
if (mainStore.config.serverUrl.toLowerCase().startsWith(`${p}://`)) {
|
||||
inputProtocols = p;
|
||||
break;
|
||||
for (const url of mainStore.config.serverUrl) {
|
||||
if (url.replace(/\\/g, "/").toLowerCase().startsWith(`${p}://`)) {
|
||||
inputProtocols.push(p);
|
||||
}
|
||||
}
|
||||
}
|
||||
if (inputProtocols) {
|
||||
mainStore.config.protocol = [inputProtocols];
|
||||
mainStore.config.serverUrl = mainStore.config.serverUrl.slice(inputProtocols.length + 3);
|
||||
mainStore.config.protocol = uniq([...mainStore.config.protocol, ...inputProtocols]);
|
||||
mainStore.config.serverUrl = (mainStore.config.serverUrl || []).map(url => {
|
||||
for (const p of protocols) {
|
||||
if (url.replace(/\\/g, "/").toLowerCase().startsWith(`${p}://`)) {
|
||||
return url.slice(p.length + 3);
|
||||
}
|
||||
}
|
||||
return url;
|
||||
});
|
||||
}
|
||||
mainStore.basePeers = uniq([mainStore.config.serverUrl, ...mainStore.basePeers]);
|
||||
mainStore.basePeers = uniq([...mainStore.config.serverUrl, ...mainStore.basePeers]);
|
||||
};
|
||||
|
||||
let getMemeberTimer: number | null = null;
|
||||
const listenObj: { [key: string]: any } = {
|
||||
unListenOutPut: null,
|
||||
unListenThreadId: null,
|
||||
@@ -975,31 +1010,34 @@
|
||||
server_thread_id: ref(null),
|
||||
async listenOutput() {
|
||||
// const appWindow = getCurrentWindow();
|
||||
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 (mainStore.configStartEnable || mainStore.config.dhcp) {
|
||||
let configIpv4 = /ipv4\s.*=\s.*[\'\"](\d+\.\d+\.\d+\.\d+).*[\'\"]/g.exec(event.payload as string)?.[1];
|
||||
if (configIpv4) {
|
||||
mainStore.config.ipv4 = configIpv4;
|
||||
}
|
||||
}
|
||||
// if (event.payload.includes("peer connection removed")) {
|
||||
// data.isSuccessGetIp = false;
|
||||
// }
|
||||
if (event.payload.includes("new peer connection added") && !data.isSuccessGetIp) {
|
||||
getMemeberTimer && clearInterval(getMemeberTimer);
|
||||
getMemeberTimer = setInterval(async () => {
|
||||
const [error, member] = await ATJ(invoke<string>("get_members_by_cli"));
|
||||
if(!data.isStart) {
|
||||
getMemeberTimer && clearInterval(getMemeberTimer);
|
||||
getMemeberTimer = null;
|
||||
ipReset();
|
||||
return;
|
||||
}
|
||||
if (!error && member !== "_EasytierGameCliFailedToConnect_") {
|
||||
const memberJson = JSON.parse(member) as Member[];
|
||||
const localData = memberJson.find(member => member?.cost == "Local");
|
||||
const ipv4 = localData?.ipv4;
|
||||
if (localData && ipv4) {
|
||||
mainStore.config.ipv4 = ipv4;
|
||||
await setTrayRunState(tray, true);
|
||||
data.isSuccessGetIp = true;
|
||||
await setTrayTooltip(tray, `IP: ${mainStore.config.ipv4}`);
|
||||
return;
|
||||
}
|
||||
if (ipv4) {
|
||||
mainStore.config.ipv4 = ipv4;
|
||||
await setTrayTooltip(tray, `IP: ${ipv4}`);
|
||||
}
|
||||
ipReset();
|
||||
}
|
||||
}, 1000);
|
||||
const unListen = await listen<string>("command-output", async event => {
|
||||
data.isStart = true;
|
||||
if (event.payload) {
|
||||
data.startLoading = false;
|
||||
let devName = /tun device ready. dev: (.*)/g.exec(event.payload as string)?.[1];
|
||||
if (
|
||||
devName &&
|
||||
mainStore.config.enableNetCardMetric &&
|
||||
@@ -1026,7 +1064,10 @@
|
||||
data.log = logArr.slice(start).join("\n");
|
||||
data.log += (event.payload as string) + "\n";
|
||||
});
|
||||
this.unListenOutPut = unListen;
|
||||
this.unListenOutPut = () => {
|
||||
getMemeberTimer && clearInterval(getMemeberTimer);
|
||||
unListen();
|
||||
};
|
||||
},
|
||||
async listenThreadId() {
|
||||
const unListen = await listen("thread-id", event => {
|
||||
@@ -1134,6 +1175,27 @@
|
||||
// await getReleaseList();
|
||||
};
|
||||
|
||||
const handleShowPublicServersDialog = async () => {
|
||||
await etWindows(
|
||||
"nodesList",
|
||||
{
|
||||
title: "公共服务器节点",
|
||||
width: 1000,
|
||||
height: 600,
|
||||
minWidth: 800,
|
||||
minHeight: 500,
|
||||
resizable: true,
|
||||
url: "#/nodesList"
|
||||
},
|
||||
(_, appWindow) => {
|
||||
data.nodesListVisible = true;
|
||||
},
|
||||
() => {
|
||||
data.nodesListVisible = false;
|
||||
}
|
||||
);
|
||||
};
|
||||
|
||||
let unlistenDownload: UnlistenFn | null = null;
|
||||
let unlistenDownloadError: UnlistenFn | null = null;
|
||||
let progress = ref<number>(0);
|
||||
@@ -1242,6 +1304,13 @@
|
||||
}
|
||||
};
|
||||
|
||||
// 多选serverUrl兼容
|
||||
const compatibleInitServerUrl = async () => {
|
||||
if (typeof mainStore.config.serverUrl == "string") {
|
||||
mainStore.config.serverUrl = [mainStore.config.serverUrl || ""];
|
||||
}
|
||||
};
|
||||
|
||||
const initGuiJson = async () => {
|
||||
const path = import.meta.env.VITE_CONFIG_FILE_NAME;
|
||||
const isExists = await exists(path, { baseDir: BaseDirectory.Resource });
|
||||
@@ -1257,19 +1326,21 @@
|
||||
// const resultStr = guiJsonStr.replace(regex, "").replace(regex2, "$1");
|
||||
// console.log(resultStr);
|
||||
const guiJson = JSON.parse(guiJsonStr);
|
||||
let saveServerUrl = "";
|
||||
let saveServerUrl = [];
|
||||
if (guiJson.serverUrl) {
|
||||
if (Array.isArray(guiJson.serverUrl)) {
|
||||
mainStore.basePeers = uniq([...guiJson.serverUrl, ...mainStore.basePeers]);
|
||||
saveServerUrl = uniq([...guiJson.serverUrl]);
|
||||
}
|
||||
if (typeof guiJson.serverUrl === "string") {
|
||||
mainStore.basePeers = uniq([...guiJson.serverUrl.split(","), ...mainStore.basePeers]);
|
||||
saveServerUrl = [mainStore.basePeers[0] || ""];
|
||||
guiJson.serverUrl = guiJson.serverUrl ? guiJson.serverUrl.split(",") : [];
|
||||
}
|
||||
saveServerUrl = mainStore.basePeers[0] || "";
|
||||
} else {
|
||||
saveServerUrl = mainStore.basePeers.length > 0 ? mainStore.basePeers[0] || "" : "";
|
||||
saveServerUrl = [mainStore.basePeers.length > 0 ? mainStore.basePeers[0] || "" : ""];
|
||||
}
|
||||
data.configJsonSeverUrl = guiJson.serverUrl;
|
||||
data.configJsonSeverUrl = [...guiJson.serverUrl] as any;
|
||||
if (guiJson.enableKcpProxy && guiJson.enableQuicProxy) {
|
||||
// 如果同时开启kcp代理和quic代理,则禁用quic代理
|
||||
guiJson.enableQuicProxy = false;
|
||||
@@ -1338,11 +1409,12 @@
|
||||
});
|
||||
};
|
||||
|
||||
let logsTimer: NodeJS.Timeout | null = null;
|
||||
let serverLogsTimer: NodeJS.Timeout | null = null;
|
||||
let cidrTimer: NodeJS.Timeout | null = null;
|
||||
let logsTimer: number | null = null;
|
||||
let serverLogsTimer: number | null = null;
|
||||
let cidrTimer: number | null = null;
|
||||
|
||||
onMounted(async () => {
|
||||
await compatibleInitServerUrl();
|
||||
await initGuiJson();
|
||||
await compatibleInitAutoStart();
|
||||
// await initAutoStart();
|
||||
@@ -1414,7 +1486,16 @@
|
||||
return [];
|
||||
}
|
||||
}
|
||||
|
||||
if (mainStore.config.serverUrl?.length <= 0) {
|
||||
ElMessage.warning(`请至少选择一个服务器`);
|
||||
return [];
|
||||
}
|
||||
// lodash-es 如何将两个数组的值混合 比如["tcp","udp"] [1,2]
|
||||
// 混合后["tcp1","tcp2","udp1","udp2"]
|
||||
if (mainStore.config.protocol?.length <= 0) {
|
||||
ElMessage.warning(`请至少选择一个协议`);
|
||||
return [];
|
||||
}
|
||||
if (mainStore.config.dhcp) {
|
||||
args.push("-d");
|
||||
}
|
||||
@@ -1431,8 +1512,8 @@
|
||||
args.push("--ipv4", mainStore.config.ipv4.trim());
|
||||
}
|
||||
if (mainStore.config.serverUrl) {
|
||||
const formatUrl = mainStore.config.serverUrl.replace(/\\/g, "/");
|
||||
args.push("--peers", ...mainStore.config.protocol.map(protocol => `${protocol}://${formatUrl}`));
|
||||
const formatUrlArr = mainStore.config.serverUrl.map((url: string) => url.replace(/\\/g, "/"));
|
||||
args.push("--peers", ...mixedArray(mainStore.config.protocol, formatUrlArr, "://"));
|
||||
}
|
||||
if (mainStore.config.enableCustomProtocol) {
|
||||
const includes = mainStore.config.protocol.includes(mainStore.config.customProtocol);
|
||||
@@ -1444,7 +1525,7 @@
|
||||
args.push("--disable-p2p");
|
||||
}
|
||||
if (mainStore.config.disableIpv6) {
|
||||
args.push("--disable-ipv6");
|
||||
args.push("--disable-ipv6", "true");
|
||||
}
|
||||
if (mainStore.config.disbleListenner) {
|
||||
args.push("--no-listener");
|
||||
@@ -1471,33 +1552,35 @@
|
||||
return /^\d+\.\d+\.\d+\.\d+\/\d+$/g.test(cidr);
|
||||
});
|
||||
if (newformatProxyNetworks.length > 0) {
|
||||
args.push("--proxy-networks", ...newformatProxyNetworks);
|
||||
for(const cidr of newformatProxyNetworks) {
|
||||
args.push("-n", cidr);
|
||||
}
|
||||
}
|
||||
mainStore.config.proxyNetworks = formatProxyNetworks.join("\n");
|
||||
}
|
||||
if (mainStore.config.disableEncryption) {
|
||||
args.push("--disable-encryption");
|
||||
args.push("--disable-encryption", "true");
|
||||
}
|
||||
if (mainStore.config.multiThread) {
|
||||
args.push("--multi-thread");
|
||||
args.push("--multi-thread", "true");
|
||||
}
|
||||
if (mainStore.config.enablExitNode) {
|
||||
args.push("--enable-exit-node");
|
||||
args.push("--enable-exit-node", "true");
|
||||
}
|
||||
if (mainStore.config.noTun) {
|
||||
args.push("--no-tun");
|
||||
args.push("--no-tun", "true");
|
||||
}
|
||||
if (mainStore.config.latencyfirst) {
|
||||
args.push("--latency-first");
|
||||
args.push("--latency-first", "true");
|
||||
}
|
||||
if (mainStore.config.useSmoltcp) {
|
||||
args.push("--use-smoltcp");
|
||||
args.push("--use-smoltcp", "true");
|
||||
}
|
||||
if (mainStore.config.disableUdpHolePunching) {
|
||||
args.push("--disable-udp-hole-punching");
|
||||
args.push("--disable-udp-hole-punching", "true");
|
||||
}
|
||||
if (mainStore.config.relayAllPeerrpc) {
|
||||
args.push("--relay-all-peer-rpc");
|
||||
args.push("--relay-all-peer-rpc", "true");
|
||||
}
|
||||
if (mainStore.config.saveErrorLog) {
|
||||
args.push("--file-log-level", mainStore.config.logLevel, "--file-log-dir", import.meta.env.VITE_LOG_PATH);
|
||||
@@ -1520,11 +1603,26 @@
|
||||
if (mainStore.config.disableQuicInput) {
|
||||
args.push("--disable-quic-input", "true");
|
||||
}
|
||||
if (mainStore.config.enableUdpBroadcastRelay) {
|
||||
args.push("--enable-udp-broadcast-relay", "true");
|
||||
}
|
||||
if (!mainStore.config.enableUpnp) {
|
||||
args.push("--disable-upnp", "true");
|
||||
}
|
||||
if (mainStore.config.ipv6PublicAddrProvider) {
|
||||
args.push("--ipv6-public-addr-provider", "true");
|
||||
}
|
||||
if (mainStore.config.ipv6PublicAddrAuto) {
|
||||
args.push("--ipv6-public-addr-auto", "true");
|
||||
}
|
||||
if (mainStore.config.disableRelayData) {
|
||||
args.push("--disable-relay-data", "true");
|
||||
}
|
||||
if (mainStore.config.bindDeviceEnable) {
|
||||
args.push("--bind-device", "true");
|
||||
}
|
||||
if (mainStore.proxyForwardBySystem) {
|
||||
args.push("--proxy-forward-by-system");
|
||||
args.push("--proxy-forward-by-system", "true");
|
||||
}
|
||||
if (mainStore.config.acceptDNS) {
|
||||
args.push("--accept-dns", "true");
|
||||
@@ -1555,12 +1653,17 @@
|
||||
return args;
|
||||
};
|
||||
|
||||
const reset = async () => {
|
||||
data.isStart = false;
|
||||
const ipReset = async () => {
|
||||
data.isSuccessGetIp = false;
|
||||
if (mainStore.config.dhcp) {
|
||||
mainStore.config.ipv4 = "";
|
||||
}
|
||||
await setTrayRunState(tray, false);
|
||||
await setTrayTooltip(tray);
|
||||
};
|
||||
|
||||
const reset = async () => {
|
||||
data.isStart = false;
|
||||
const memberDialog = await getAllWebviewWindows();
|
||||
const memberDialogs = memberDialog.filter(item => item.label === "member");
|
||||
if (memberDialogs && memberDialogs.length > 0) {
|
||||
@@ -1572,9 +1675,8 @@
|
||||
}
|
||||
}
|
||||
}
|
||||
await setTrayRunState(tray, false);
|
||||
await setTrayTooltip(tray);
|
||||
await unListenAll();
|
||||
await ipReset();
|
||||
};
|
||||
|
||||
const handleConnection = async () => {
|
||||
@@ -1723,6 +1825,9 @@
|
||||
if (command === "create_server") {
|
||||
await handleShowServerDialog();
|
||||
}
|
||||
if (command === "cidr") {
|
||||
await handleShowCidrDialog();
|
||||
}
|
||||
if (command === "config_admin") {
|
||||
configAdminData.visible = true;
|
||||
const path = import.meta.env.VITE_CONFIG_ADMIN_PATH;
|
||||
@@ -1885,7 +1990,13 @@
|
||||
});
|
||||
if (!err) {
|
||||
const payload = JSON.parse(decodeURIComponent(atob(importConfigData.data)));
|
||||
payload.config.serverUrl = payload?.config?.serverUrl?.trim() || mainStore.config.serverUrl;
|
||||
payload.config.serverUrl = Array.isArray(payload?.config?.serverUrl)
|
||||
? payload?.config?.serverUrl
|
||||
: typeof payload?.config?.serverUrl == "string"
|
||||
? [payload?.config?.serverUrl.split(",")]
|
||||
: typeof mainStore.config.serverUrl == "string"
|
||||
? [mainStore.config.serverUrl]
|
||||
: [];
|
||||
mainStore.$patch({
|
||||
config: {
|
||||
...mainStore.config,
|
||||
@@ -1894,7 +2005,7 @@
|
||||
});
|
||||
ElMessage.success("导入成功");
|
||||
importConfigData.visible = false;
|
||||
mainStore.basePeers = uniq([mainStore.config.serverUrl, ...mainStore.basePeers].filter(el => el.trim()));
|
||||
mainStore.basePeers = uniq([...(mainStore.config.serverUrl || []), ...mainStore.basePeers].filter(el => el.trim()));
|
||||
} else {
|
||||
console.error(err);
|
||||
if (err !== "cancel") {
|
||||
@@ -1932,7 +2043,7 @@
|
||||
|
||||
const handleShowMemberDialog = async () => {
|
||||
if (!data.isStart) {
|
||||
return ElMessage.warning("请先开始联机");
|
||||
return ElMessage.warning("请先启动联机");
|
||||
}
|
||||
// if (!mainStore.config.ipv4) {
|
||||
// return ElMessage.warning("请等待获取IP");
|
||||
|
||||
+7
-1
@@ -12,7 +12,10 @@
|
||||
@scroll="handleScroll"
|
||||
class="overflow-auto"
|
||||
>
|
||||
<div v-if="!data.log || data.log.length <= 0" class="p-[5px]">
|
||||
<div
|
||||
v-if="!data.log || data.log.length <= 0"
|
||||
class="p-[5px]"
|
||||
>
|
||||
<ElText type="info">等待日志中,请先'启动联机'...</ElText>
|
||||
</div>
|
||||
<div
|
||||
@@ -106,6 +109,9 @@
|
||||
.split("\n")
|
||||
.filter(text => text.trim())
|
||||
.map((text, idx) => {
|
||||
if (idx === 0) {
|
||||
return { id: `${text}-${idx}`, text, type: "primary" };
|
||||
}
|
||||
const toLowerCaseText = text.toLocaleLowerCase();
|
||||
return {
|
||||
id: `${text}-${idx}`,
|
||||
|
||||
+137
-83
@@ -1,6 +1,6 @@
|
||||
<template>
|
||||
<div class="h-full overflow-auto">
|
||||
<div class="w-[1200px]">
|
||||
<div class="max-w-[2000px]">
|
||||
<ElText
|
||||
size="small"
|
||||
v-if="!data.member || data.member.length <= 0"
|
||||
@@ -10,26 +10,41 @@
|
||||
<ElTable
|
||||
stripe
|
||||
border
|
||||
:data="data.member"
|
||||
:data="computedMember"
|
||||
v-else
|
||||
>
|
||||
<ElTableColumn
|
||||
sortable
|
||||
width="140"
|
||||
label="成员名"
|
||||
prop="hostname"
|
||||
>
|
||||
<template #default="{ row }">
|
||||
{{
|
||||
(row.hostname || "").toLowerCase().includes("publicserver")
|
||||
? (row.hostname || "").replace("PublicServer", "服务器")
|
||||
: row.hostname || "-"
|
||||
}}
|
||||
<div :class="`whitespace-pre-wrap`">
|
||||
<div>
|
||||
{{
|
||||
(row.hostname || "").toLowerCase().includes("publicserver")
|
||||
? (row.hostname || "").replace("PublicServer", "服务器")
|
||||
: row.hostname || "-"
|
||||
}}
|
||||
</div>
|
||||
<div
|
||||
class="space-y-1"
|
||||
v-if="row?.connections_addrs?.length > 0"
|
||||
>
|
||||
<ElTag
|
||||
:key="url"
|
||||
v-for="url in row.connections_addrs"
|
||||
class="!flex !h-auto !whitespace-pre-wrap !break-all !py-[5px]"
|
||||
>
|
||||
{{ url }}
|
||||
</ElTag>
|
||||
</div>
|
||||
</div>
|
||||
</template>
|
||||
</ElTableColumn>
|
||||
<ElTableColumn
|
||||
sortable
|
||||
width="90"
|
||||
width="70"
|
||||
prop="cost"
|
||||
label="方式"
|
||||
>
|
||||
@@ -50,11 +65,29 @@
|
||||
label="虚拟网IP"
|
||||
:sort-method="sortIpv4"
|
||||
:sort-orders="['ascending', 'descending', null]"
|
||||
></ElTableColumn>
|
||||
>
|
||||
<template #default="{ row }">
|
||||
<div class="space-y-[5px]">
|
||||
<div>
|
||||
{{ row.ipv4 || "-" }}
|
||||
</div>
|
||||
<div v-if="row.proxy?.[0]">
|
||||
<ElTooltip :content="row.proxy?.[1] == 'Connected' ? '已连接' : '已断开'">
|
||||
<ElTag
|
||||
size="small"
|
||||
:type="row.proxy?.[1] == 'Connected' ? 'success' : 'danger'"
|
||||
>
|
||||
{{ row.proxy?.[0] || "-" }}代理
|
||||
</ElTag>
|
||||
</ElTooltip>
|
||||
</div>
|
||||
</div>
|
||||
</template>
|
||||
</ElTableColumn>
|
||||
<ElTableColumn
|
||||
sortable
|
||||
prop="lat_ms"
|
||||
width="100"
|
||||
width="80"
|
||||
label="延迟/ms"
|
||||
:sort-method="sortLatMs"
|
||||
:sort-orders="['ascending', 'descending', null]"
|
||||
@@ -65,22 +98,28 @@
|
||||
</ElTableColumn>
|
||||
<ElTableColumn
|
||||
sortable
|
||||
width="100"
|
||||
width="70"
|
||||
prop="loss_rate"
|
||||
label="丢包率"
|
||||
>
|
||||
<template #default="{ row }">
|
||||
{{ row.loss_rate && row.loss_rate != "-" ? Number(row.loss_rate * 100).toFixed(2) + "%" : row.loss_rate }}
|
||||
{{
|
||||
row.loss_rate && row.loss_rate != "-"
|
||||
? row.loss_rate.endsWith("%")
|
||||
? row.loss_rate
|
||||
: Number(row.loss_rate * 100).toFixed(2) + "%"
|
||||
: row.loss_rate
|
||||
}}
|
||||
</template>
|
||||
</ElTableColumn>
|
||||
<ElTableColumn
|
||||
sortable
|
||||
width="110"
|
||||
width="100"
|
||||
label="NAT类型"
|
||||
prop="nat_type"
|
||||
>
|
||||
<template #default="{ row }">
|
||||
{{ natMaps[row.nat_type.toLowerCase() as natKyes] || row.nat_type || "-" }}
|
||||
{{ natMaps[row.nat_type.toLowerCase() as NATKyes] || row.nat_type || "-" }}
|
||||
</template>
|
||||
</ElTableColumn>
|
||||
<ElTableColumn
|
||||
@@ -107,7 +146,7 @@
|
||||
sortable
|
||||
prop="tx_bytes"
|
||||
label="传输"
|
||||
:sort-method="(a, b) => sortBytes(a, b, 'tx_bytes')"
|
||||
:sort-method="(a: any, b: any) => sortBytes(a, b, 'tx_bytes')"
|
||||
:sort-orders="['ascending', 'descending', null]"
|
||||
></ElTableColumn>
|
||||
</ElTable>
|
||||
@@ -116,24 +155,12 @@
|
||||
</template>
|
||||
<script setup lang="ts">
|
||||
import { invoke } from "@tauri-apps/api/core";
|
||||
import { reactive, onMounted, onBeforeUnmount } from "vue";
|
||||
import { ATJ, parseCliInfo } from "@/utils";
|
||||
import { reactive, onMounted, onBeforeUnmount, computed } from "vue";
|
||||
import { ATJ } from "@/utils";
|
||||
import { ElConfirmDanger } from "~/utils/element";
|
||||
import { getCurrentWindow } from "@tauri-apps/api/window";
|
||||
import { isNaN } from "lodash-es";
|
||||
// enum NatType {
|
||||
// // has NAT; but own a single public IP, port is not changed
|
||||
// Unknown = 0;
|
||||
// OpenInternet = 1;
|
||||
// NoPAT = 2;
|
||||
// FullCone = 3;
|
||||
// Restricted = 4;
|
||||
// PortRestricted = 5;
|
||||
// Symmetric = 6;
|
||||
// SymUdpFirewall = 7;
|
||||
// SymmetricEasyInc = 8;
|
||||
// SymmetricEasyDec = 9;
|
||||
// }
|
||||
|
||||
const natMaps = {
|
||||
unknown: "未知",
|
||||
OpenInternet: "nat0-openinternet",
|
||||
@@ -146,15 +173,32 @@
|
||||
symmetriceasyinc: "nat4-easyinc",
|
||||
symUdpfirewall: "nat4-udpfirewall"
|
||||
};
|
||||
type natKyes = keyof typeof natMaps;
|
||||
|
||||
const data = reactive<{ member: { hostname: string; cost: string; ipv4: string; lat_msg: string; loss_rate: string; nat_type: string }[] }>({
|
||||
member: []
|
||||
type NATKyes = keyof typeof natMaps;
|
||||
|
||||
const data = reactive<{ member: Member[]; proxy: Proxy[] }>({
|
||||
member: [],
|
||||
proxy: []
|
||||
});
|
||||
|
||||
const computedMember = computed(() => {
|
||||
const localMember = data.member.find(member => member?.cost == "Local");
|
||||
if (!localMember) return data.member;
|
||||
const ipv4 = localMember.ipv4;
|
||||
const proxyMember = data.proxy?.filter(proxy => proxy.src.startsWith(`${ipv4}:`));
|
||||
const proxyObj: Record<string, [string, "Connected" | "Closed"]> = {};
|
||||
for (const proxy of proxyMember) {
|
||||
proxyObj[proxy.dst.split(":")[0]] = [proxy.transport_type, proxy.state];
|
||||
}
|
||||
return data.member.map(m => {
|
||||
m.proxy = proxyObj?.[m.ipv4.split(":")?.[0]] || m?.proxy || ["", "Closed"];
|
||||
return m;
|
||||
});
|
||||
});
|
||||
|
||||
// 延迟排序函数
|
||||
const sortLatMs = (a: any, b: any): number => {
|
||||
const getLatencyValue = (row: any): number => {
|
||||
const sortLatMs = (a: Member, b: Member): number => {
|
||||
const getLatencyValue = (row: Member): number => {
|
||||
const latMs = row.lat_ms;
|
||||
|
||||
if (latMs === null || latMs === undefined || latMs === "") {
|
||||
@@ -214,7 +258,7 @@
|
||||
};
|
||||
|
||||
// 字节数据排序函数
|
||||
const sortBytes = (a: any, b: any, field: string = 'rx_bytes'): number => {
|
||||
const sortBytes = (a: any, b: any, field: string = "rx_bytes"): number => {
|
||||
const parseBytes = (bytesStr: string): number => {
|
||||
if (!bytesStr || bytesStr === "-" || bytesStr === "") {
|
||||
return 0;
|
||||
@@ -222,7 +266,7 @@
|
||||
|
||||
// 统一转换为小写并去除空格
|
||||
const cleanStr = bytesStr.toLowerCase().trim();
|
||||
|
||||
|
||||
// 使用正则表达式匹配数字和单位
|
||||
const match = cleanStr.match(/^(\d+(?:\.\d+)?)\s*([a-z]*)$/);
|
||||
if (!match) {
|
||||
@@ -238,30 +282,30 @@
|
||||
|
||||
// 根据单位转换为字节数
|
||||
switch (unit) {
|
||||
case 'b':
|
||||
case 'byte':
|
||||
case 'bytes':
|
||||
case '':
|
||||
case "b":
|
||||
case "byte":
|
||||
case "bytes":
|
||||
case "":
|
||||
return value;
|
||||
case 'k':
|
||||
case 'kb':
|
||||
case 'kib':
|
||||
case "k":
|
||||
case "kb":
|
||||
case "kib":
|
||||
return value * 1024;
|
||||
case 'm':
|
||||
case 'mb':
|
||||
case 'mib':
|
||||
case "m":
|
||||
case "mb":
|
||||
case "mib":
|
||||
return value * 1024 * 1024;
|
||||
case 'g':
|
||||
case 'gb':
|
||||
case 'gib':
|
||||
case "g":
|
||||
case "gb":
|
||||
case "gib":
|
||||
return value * 1024 * 1024 * 1024;
|
||||
case 't':
|
||||
case 'tb':
|
||||
case 'tib':
|
||||
case "t":
|
||||
case "tb":
|
||||
case "tib":
|
||||
return value * 1024 * 1024 * 1024 * 1024;
|
||||
case 'p':
|
||||
case 'pb':
|
||||
case 'pib':
|
||||
case "p":
|
||||
case "pb":
|
||||
case "pib":
|
||||
return value * 1024 * 1024 * 1024 * 1024 * 1024;
|
||||
default:
|
||||
return value; // 未知单位当作字节处理
|
||||
@@ -292,24 +336,10 @@
|
||||
return num.toFixed(0);
|
||||
};
|
||||
|
||||
const _showTableHeader = [
|
||||
["hostname", "主机名"],
|
||||
["cost", "路由"],
|
||||
["ipv4", "虚拟网IP"],
|
||||
["lat_ms", "延迟/ms"],
|
||||
["loss_rate", "丢包率"],
|
||||
["nat_type", "NAT类型"],
|
||||
["version", "版本"],
|
||||
["tunnel_proto", "隧道协议"],
|
||||
["rx_bytes", "接收"],
|
||||
["tx_bytes", "传输"]
|
||||
];
|
||||
|
||||
let timer: NodeJS.Timeout | null = null;
|
||||
let timer: number | null = null;
|
||||
|
||||
const listenOutput = async () => {
|
||||
const [error, member] = await ATJ(invoke<string>("get_members_by_cli"));
|
||||
// if(!member) return;
|
||||
if (error) {
|
||||
data.member = [];
|
||||
return "";
|
||||
@@ -329,20 +359,44 @@
|
||||
}
|
||||
return;
|
||||
}
|
||||
const peerInfo = parseCliInfo(member);
|
||||
peerInfo.forEach(value => {
|
||||
if (value.cost === "Local") {
|
||||
value.cost = "本机";
|
||||
}
|
||||
if (value.ipv4 && value.ipv4.includes("/")) {
|
||||
value.ipv4 = value.ipv4.split("/")[0];
|
||||
}
|
||||
});
|
||||
// console.log(peerInfo)
|
||||
data.member = peerInfo;
|
||||
const [errorConnections, connections] = await ATJ(invoke<string>("get_members_connections_cli"));
|
||||
const memberConnections: ConnectionsType[] = JSON.parse(connections) as ConnectionsType[];
|
||||
|
||||
if (errorConnections != "_EasytierGameCliFailedToGetConnections_") {
|
||||
data.member = (JSON.parse(member) as Member[]).map(member => {
|
||||
const connection = memberConnections.find(conn => String(conn.route.peer_id) === member.id);
|
||||
if (connection) {
|
||||
member.connections_addrs = connection?.peer?.conns?.map(conn => conn?.tunnel?.remote_addr?.url || "") || [];
|
||||
} else {
|
||||
member.connections_addrs = [];
|
||||
}
|
||||
return member;
|
||||
});
|
||||
} else {
|
||||
data.member = JSON.parse(member) as Member[];
|
||||
}
|
||||
// console.log(data.member);
|
||||
getMembersProxy();
|
||||
startTimer();
|
||||
};
|
||||
|
||||
const getMembersProxy = async () => {
|
||||
const [error, proxy] = await ATJ(invoke<string>("get_members_proxy"));
|
||||
if (error) {
|
||||
data.proxy = [];
|
||||
return "";
|
||||
}
|
||||
if (proxy === "_EasytierGameCliFailedToGetProxy_") {
|
||||
data.proxy = [];
|
||||
return "";
|
||||
}
|
||||
try {
|
||||
data.proxy = JSON.parse(proxy) as Proxy[];
|
||||
} catch (error) {
|
||||
data.proxy = [];
|
||||
}
|
||||
};
|
||||
|
||||
const startTimer = () => {
|
||||
timer && clearTimeout(timer);
|
||||
timer = setTimeout(() => {
|
||||
|
||||
@@ -0,0 +1,389 @@
|
||||
<template>
|
||||
<div class="relative flex h-full flex-col flex-wrap gap-[0] overflow-hidden">
|
||||
<div class="flex h-[40px] w-full flex-nowrap items-center gap-[0_8px]">
|
||||
<div class="ml-[5px] mr-auto flex">
|
||||
<ElText class="text-lg font-semibold">公共服务器节点列表</ElText>
|
||||
</div>
|
||||
<div class="flex w-fit flex-nowrap items-center gap-[0_8px]">
|
||||
<div>
|
||||
<ElInput
|
||||
placeholder="搜索名称/地址"
|
||||
v-model="searchName"
|
||||
clearable
|
||||
></ElInput>
|
||||
</div>
|
||||
<div>
|
||||
<ElButton
|
||||
size="small"
|
||||
type="primary"
|
||||
@click="refreshNodes"
|
||||
>
|
||||
刷新
|
||||
</ElButton>
|
||||
<ElButton
|
||||
:disabled="selectedNodes.length === 0"
|
||||
size="small"
|
||||
type="success"
|
||||
class="mr-[8px]"
|
||||
@click="addSelectedToServerList"
|
||||
>
|
||||
添加选中 ({{ selectedNodes.length }})
|
||||
</ElButton>
|
||||
<ElTag
|
||||
size="small"
|
||||
type="info"
|
||||
>
|
||||
最后更新: {{ lastUpdateTime || "00:00:00" }}
|
||||
</ElTag>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="flex w-full flex-1 flex-wrap gap-[0] overflow-auto">
|
||||
<ElTable
|
||||
:data="computedNodes"
|
||||
stripe
|
||||
height="100%"
|
||||
ref="tableRef"
|
||||
:empty-text="loading ? '加载中...' : '暂无可用服务器'"
|
||||
:default-sort="{ prop: 'last_response_time', order: 'ascending' }"
|
||||
@select-all="handleSelectChange"
|
||||
@select="handleSelectChange"
|
||||
@row-click="handleRowClick"
|
||||
>
|
||||
<ElTableColumn
|
||||
type="selection"
|
||||
width="55"
|
||||
/>
|
||||
<ElTableColumn
|
||||
prop="name"
|
||||
label="服务器名称"
|
||||
width="200"
|
||||
show-overflow-tooltip
|
||||
sortable
|
||||
/>
|
||||
<ElTableColumn
|
||||
prop="protocol"
|
||||
label="协议"
|
||||
width="80"
|
||||
sortable
|
||||
>
|
||||
<template #default="{ row }">
|
||||
<ElTag
|
||||
:type="row.protocol === 'tcp' ? 'success' : 'warning'"
|
||||
size="small"
|
||||
>
|
||||
{{ row.protocol.toUpperCase() }}
|
||||
</ElTag>
|
||||
</template>
|
||||
</ElTableColumn>
|
||||
<ElTableColumn
|
||||
prop="address"
|
||||
label="地址"
|
||||
width="200"
|
||||
show-overflow-tooltip
|
||||
sortable
|
||||
/>
|
||||
<ElTableColumn
|
||||
prop="last_response_time"
|
||||
label="响应时间"
|
||||
width="100"
|
||||
sortable
|
||||
>
|
||||
<template #default="{ row }">
|
||||
<ElTag
|
||||
:type="getResponseTimeType(row.last_response_time)"
|
||||
size="small"
|
||||
>
|
||||
{{ Number(row.last_response_time / 1000).toFixed(2) }}ms
|
||||
</ElTag>
|
||||
</template>
|
||||
</ElTableColumn>
|
||||
<ElTableColumn
|
||||
prop="current_health_status"
|
||||
label="状态/健康率"
|
||||
width="120"
|
||||
sortable
|
||||
>
|
||||
<template #default="{ row }">
|
||||
<div class="flex flex-col gap-1">
|
||||
<ElTag
|
||||
:type="row.current_health_status === 'healthy' ? 'success' : 'danger'"
|
||||
size="small"
|
||||
>
|
||||
{{ row.current_health_status === "healthy" ? "健康" : "异常" }}
|
||||
</ElTag>
|
||||
<ElTag
|
||||
:type="getHealthType(row.health_percentage_24h)"
|
||||
size="small"
|
||||
>
|
||||
{{ Number(row.health_percentage_24h).toFixed(1) }}%
|
||||
</ElTag>
|
||||
</div>
|
||||
</template>
|
||||
</ElTableColumn>
|
||||
<ElTableColumn
|
||||
prop="usage_percentage"
|
||||
label="使用率"
|
||||
width="100"
|
||||
sortable
|
||||
>
|
||||
<template #default="{ row }">
|
||||
<div class="flex items-center">
|
||||
<ElProgress
|
||||
:percentage="row.usage_percentage"
|
||||
:stroke-width="6"
|
||||
:show-text="false"
|
||||
:color="getUsageColor(row.usage_percentage)"
|
||||
class="mr-2 flex-1"
|
||||
/>
|
||||
<span class="text-xs">{{ row.usage_percentage.toFixed(1) }}%</span>
|
||||
</div>
|
||||
</template>
|
||||
</ElTableColumn>
|
||||
<ElTableColumn
|
||||
prop="description"
|
||||
label="描述"
|
||||
sortable
|
||||
>
|
||||
<template #default="{ row }">
|
||||
<div class="whitespace-pre-wrap">{{ row.description }}</div>
|
||||
</template>
|
||||
</ElTableColumn>
|
||||
</ElTable>
|
||||
</div>
|
||||
</div>
|
||||
</template>
|
||||
|
||||
<script setup lang="ts">
|
||||
import useMainStore from "@/stores/index";
|
||||
import { invoke } from "@tauri-apps/api/core";
|
||||
import { reactive, onMounted, onBeforeUnmount, ref, useTemplateRef, computed, nextTick } from "vue";
|
||||
import { ElMessage, type TableInstance } from "element-plus";
|
||||
import { dataSubscribe } from "~/composables/windows";
|
||||
import { inputBounceRef } from "@/utils";
|
||||
import { uniq } from "lodash-es";
|
||||
|
||||
const mainStore = useMainStore();
|
||||
// 节点数据
|
||||
const nodes = reactive<NodeItem[]>([]);
|
||||
const loading = ref(false);
|
||||
const lastUpdateTime = ref("");
|
||||
const selectedNodes = ref<NodeItem[]>([]);
|
||||
const searchName = ref<string>("");
|
||||
const computedNodes = computed(() => {
|
||||
const v = searchName.value.trim();
|
||||
let result = nodes;
|
||||
if (v) {
|
||||
result = nodes.filter(node => node.name.includes(v) || node.address.includes(v));
|
||||
}
|
||||
nextTick(() => {
|
||||
for (const node of selectedNodes.value) {
|
||||
const nodeItem = nodes?.find(n => n.id === node.id);
|
||||
tableRef.value?.toggleRowSelection(nodeItem, true);
|
||||
}
|
||||
});
|
||||
return result;
|
||||
});
|
||||
const tableRef = useTemplateRef<TableInstance>("tableRef");
|
||||
|
||||
// 定时器
|
||||
let refreshTimer: number | null = null;
|
||||
|
||||
// 获取使用率颜色
|
||||
const getUsageColor = (percentage: number) => {
|
||||
if (percentage < 50) return "#67c23a";
|
||||
if (percentage < 80) return "#e6a23c";
|
||||
return "#f56c6c";
|
||||
};
|
||||
|
||||
// 获取响应时间类型
|
||||
const getResponseTimeType = (responseTime: number) => {
|
||||
if (responseTime < 60 * 1000) return "success";
|
||||
if (responseTime < 100 * 1000) return "warning";
|
||||
return "danger";
|
||||
};
|
||||
|
||||
// 获取健康率类型
|
||||
const getHealthType = (health: number) => {
|
||||
if (health >= 95) return "success";
|
||||
if (health >= 90) return "warning";
|
||||
return "danger";
|
||||
};
|
||||
|
||||
// 刷新节点数据
|
||||
const refreshNodes = async () => {
|
||||
loading.value = true;
|
||||
let nodesList = await invoke<string>("fetch_nodes_list", { page: 1, limit: 1000 });
|
||||
try {
|
||||
if (nodesList === "_EasytierGameFetchNodesError_") {
|
||||
nodesList = "";
|
||||
return;
|
||||
}
|
||||
if (nodesList) {
|
||||
const nodesListData: NodesResponse = JSON.parse(nodesList);
|
||||
// console.log(nodesListData);
|
||||
if (nodesListData.success && nodesListData.data.items) {
|
||||
// 过滤可用节点
|
||||
const availableNodes = filterAvailableNodes(nodesListData.data.items);
|
||||
// 按优先级排序
|
||||
const sortedNodes = sortNodesByPriority(availableNodes);
|
||||
|
||||
// 更新节点数据
|
||||
nodes.splice(0, nodes.length, ...sortedNodes);
|
||||
|
||||
// 更新最后更新时间
|
||||
lastUpdateTime.value = new Date().toLocaleTimeString();
|
||||
|
||||
// console.log(`已更新 ${sortedNodes.length} 个可用节点`);
|
||||
}
|
||||
}
|
||||
} catch (err) {
|
||||
console.log(nodesList);
|
||||
console.error("获取节点数据失败:", err);
|
||||
ElMessage.error("获取节点数据失败");
|
||||
} finally {
|
||||
loading.value = false;
|
||||
}
|
||||
};
|
||||
|
||||
// 过滤可用节点的函数
|
||||
const filterAvailableNodes = (nodes: NodeItem[]): NodeItem[] => {
|
||||
return nodes.filter(node => {
|
||||
// 基本条件:节点必须激活且被批准
|
||||
if (!node.is_active || !node.is_approved) {
|
||||
return false;
|
||||
}
|
||||
|
||||
// 健康状态检查
|
||||
if (node.current_health_status !== "healthy") {
|
||||
return false;
|
||||
}
|
||||
|
||||
// 使用率检查:使用率不能超过95%
|
||||
if (node.usage_percentage > 95) {
|
||||
return false;
|
||||
}
|
||||
|
||||
// 24小时健康率检查:必须大于90%
|
||||
if (node.health_percentage_24h < 90) {
|
||||
return false;
|
||||
}
|
||||
|
||||
// 响应时间检查:响应时间不能超过60秒
|
||||
if (node.last_response_time > 60000) {
|
||||
return false;
|
||||
}
|
||||
|
||||
// 连接数检查:当前连接数不能超过最大连接数的90%
|
||||
if (node.current_connections > node.max_connections * 0.9) {
|
||||
return false;
|
||||
}
|
||||
|
||||
// 必须有有效的地址
|
||||
if (!node.address || !node.host || !node.port) {
|
||||
return false;
|
||||
}
|
||||
|
||||
return true;
|
||||
});
|
||||
};
|
||||
|
||||
// 按优先级排序节点的函数
|
||||
const sortNodesByPriority = (nodes: NodeItem[]): NodeItem[] => {
|
||||
return nodes.sort((a, b) => {
|
||||
// 优先级排序规则:
|
||||
// 1. 响应时间越短越好
|
||||
// 2. 使用率越低越好
|
||||
// 3. 24小时健康率越高越好
|
||||
// 4. 当前连接数越少越好
|
||||
|
||||
// 响应时间权重最高
|
||||
const responseTimeDiff = a.last_response_time - b.last_response_time;
|
||||
if (Math.abs(responseTimeDiff) > 1000) {
|
||||
// 如果响应时间差异超过1秒
|
||||
return responseTimeDiff;
|
||||
}
|
||||
|
||||
// 使用率权重次之
|
||||
const usageDiff = a.usage_percentage - b.usage_percentage;
|
||||
if (Math.abs(usageDiff) > 5) {
|
||||
// 如果使用率差异超过5%
|
||||
return usageDiff;
|
||||
}
|
||||
|
||||
// 24小时健康率
|
||||
const healthDiff = b.health_percentage_24h - a.health_percentage_24h;
|
||||
if (Math.abs(healthDiff) > 1) {
|
||||
// 如果健康率差异超过1%
|
||||
return healthDiff;
|
||||
}
|
||||
|
||||
// 当前连接数
|
||||
return a.current_connections - b.current_connections;
|
||||
});
|
||||
};
|
||||
|
||||
// 启动定时器
|
||||
const startRefreshTimer = () => {
|
||||
refreshTimer = setInterval(() => {
|
||||
refreshNodes();
|
||||
}, 60000); // 10秒刷新一次
|
||||
};
|
||||
|
||||
// 停止定时器
|
||||
const stopRefreshTimer = () => {
|
||||
if (refreshTimer) {
|
||||
clearInterval(refreshTimer);
|
||||
refreshTimer = null;
|
||||
}
|
||||
};
|
||||
|
||||
// 处理选择变化
|
||||
const handleSelectChange = (selection: NodeItem[]) => {
|
||||
selectedNodes.value = selection;
|
||||
};
|
||||
|
||||
const handleRowClick = (row: NodeItem) => {
|
||||
tableRef.value?.toggleRowSelection(row);
|
||||
selectedNodes.value = tableRef.value?.getSelectionRows() || [];
|
||||
};
|
||||
|
||||
// 添加选中的服务器到主页面服务器列表
|
||||
const addSelectedToServerList = async () => {
|
||||
if (selectedNodes.value.length === 0) {
|
||||
ElMessage.warning("请先选择要添加的服务器");
|
||||
return;
|
||||
}
|
||||
|
||||
try {
|
||||
// 提取服务器地址(去掉协议前缀)
|
||||
const protocols = selectedNodes.value.map(node => node.protocol.toLowerCase());
|
||||
const serverAddresses = selectedNodes.value.map(node => node.address.replace(`${node.protocol}://`, ""));
|
||||
mainStore.basePeers = uniq([...mainStore.basePeers, ...serverAddresses]);
|
||||
mainStore.config.serverUrl = uniq([...serverAddresses, ...mainStore.config.serverUrl]);
|
||||
mainStore.config.protocol = uniq([...protocols, ...mainStore.config.protocol]);
|
||||
ElMessage.success(`${selectedNodes.value.length} 个服务器,添加成功`);
|
||||
|
||||
// 清空选择
|
||||
tableRef.value?.clearSelection();
|
||||
selectedNodes.value = [];
|
||||
} catch (err) {
|
||||
console.error("处理选中服务器失败:", err);
|
||||
ElMessage.error("处理选中服务器失败");
|
||||
}
|
||||
};
|
||||
|
||||
onMounted(async () => {
|
||||
// 初始加载数据
|
||||
await refreshNodes();
|
||||
// 启动定时器
|
||||
startRefreshTimer();
|
||||
});
|
||||
|
||||
onBeforeUnmount(() => {
|
||||
// 清理定时器
|
||||
stopRefreshTimer();
|
||||
});
|
||||
|
||||
dataSubscribe();
|
||||
</script>
|
||||
@@ -44,6 +44,18 @@
|
||||
>
|
||||
<ElCheckbox v-model="mainStore.serverConfig.relayAllPeerrpc">转发所有对等节点的RPC数据包</ElCheckbox>
|
||||
</ElTooltip>
|
||||
<ElTooltip
|
||||
placement="top"
|
||||
content="持有公网 IPv6 前缀时开启,让同网络下其他节点自动获取独立公网地址"
|
||||
>
|
||||
<ElCheckbox v-model="mainStore.serverConfig.ipv6PublicAddrProvider">公网IPv6地址前缀提供</ElCheckbox>
|
||||
</ElTooltip>
|
||||
<ElTooltip
|
||||
placement="top"
|
||||
content="禁止节点转发 relay 数据流量而保留控制面功能,适用于不希望本节点承担中继带宽的场景"
|
||||
>
|
||||
<ElCheckbox v-model="mainStore.serverConfig.disableRelayData">禁用Relay数据转发</ElCheckbox>
|
||||
</ElTooltip>
|
||||
</div>
|
||||
</div>
|
||||
</template>
|
||||
|
||||
Generated
+2535
-4298
File diff suppressed because it is too large
Load Diff
@@ -1,3 +0,0 @@
|
||||
{
|
||||
"extends": "../.nuxt/tsconfig.server.json"
|
||||
}
|
||||
Generated
+1571
-1583
File diff suppressed because it is too large
Load Diff
+11
-11
@@ -1,6 +1,6 @@
|
||||
[package]
|
||||
name = "easytier-game"
|
||||
version = "1.4.8"
|
||||
version = "1.5.5"
|
||||
homepage = "https://github.com/EasyTier/EasyTier"
|
||||
repository = "https://github.com/EasyTier/EasytierGame"
|
||||
description = "A simple network initiator based on Easytier"
|
||||
@@ -18,7 +18,7 @@ name = "app_lib"
|
||||
crate-type = ["staticlib", "cdylib", "rlib"]
|
||||
|
||||
[build-dependencies]
|
||||
tauri-build = { version = "2.3.1", features = [] }
|
||||
tauri-build = { version = "2.6.1", features = [] }
|
||||
# prost-build = "0.13.2"
|
||||
|
||||
[target.x86_64-pc-windows-msvc.build-dependencies]
|
||||
@@ -28,24 +28,24 @@ thunk-rs = { git = "https://github.com/easytier/thunk.git", default-features = f
|
||||
serde_json = "1.0.137"
|
||||
serde = { version = "1.0.217", features = ["derive"] }
|
||||
log = "0.4.26"
|
||||
tauri = { version = "2.7.0", features = [ "protocol-asset",
|
||||
tauri = { version = "2.11.1", features = [ "protocol-asset",
|
||||
"tray-icon",
|
||||
"image-png",
|
||||
"image-ico"
|
||||
] }
|
||||
|
||||
tauri-plugin-log = "2.6.0"
|
||||
tauri-plugin-shell = "2.3.0"
|
||||
tauri-plugin-log = "2.8.0"
|
||||
tauri-plugin-shell = "2.3.5"
|
||||
reqwest = { version = "0.12.12", features = ["json"] }
|
||||
zip = "2.2.3"
|
||||
sysinfo = '0.33.1'
|
||||
# planif = { git = "https://github.com/mattrobineau/planif", tag = "1.0.1" }
|
||||
whoami = "1.5.2"
|
||||
tauri-plugin-fs = "2.4.1"
|
||||
tauri-plugin-clipboard-manager = "2.3.0"
|
||||
tauri-plugin-fs = "2.5.1"
|
||||
tauri-plugin-clipboard-manager = "2.3.2"
|
||||
rand = "0.9.0"
|
||||
tokio = { version = "1.45.1", features = ["process"] }
|
||||
tauri-plugin-dialog = "2.3.1"
|
||||
tauri-plugin-dialog = "2.7.1"
|
||||
# prost = "0.13"
|
||||
# prost-types = "0.13"
|
||||
hashbrown = "0.15.2"
|
||||
@@ -56,6 +56,6 @@ version = "0.61.3"
|
||||
features = ["Win32_System_TaskScheduler", "Win32_System_Com", "Win32_System_Power", "Win32_NetworkManagement_IpHelper", "Win32_NetworkManagement_Ndis", "Win32_Networking_WinSock"]
|
||||
|
||||
[target."cfg(not(any(target_os = \"android\", target_os = \"ios\")))".dependencies]
|
||||
tauri-plugin-cli = "2.4.0"
|
||||
tauri-plugin-single-instance = "2.3.2"
|
||||
tauri-plugin-window-state = "2.4.0"
|
||||
tauri-plugin-cli = "2.4.1"
|
||||
tauri-plugin-single-instance = "2.4.2"
|
||||
tauri-plugin-window-state = "2.4.1"
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
"$schema": "../gen/schemas/desktop-schema.json",
|
||||
"identifier": "default",
|
||||
"description": "enables the default permissions",
|
||||
"windows": ["main", "log", "member", "cidr", "advance", "tool", "server", "gameList", "storage-listener"],
|
||||
"windows": ["main", "log", "member", "nodesList", "cidr", "advance", "tool", "server", "gameList", "storage-listener"],
|
||||
"permissions": [
|
||||
"core:default",
|
||||
"core:window:allow-minimize",
|
||||
|
||||
Binary file not shown.
@@ -14,7 +14,13 @@
|
||||
"networkName": "", //房间名
|
||||
"networkPassword": "", //房间密码
|
||||
"hostname": "", //主机名
|
||||
"ipv4": "", // 虚拟IP地址
|
||||
"ipv4": "", // 虚拟IPv4地址
|
||||
"ipv6": "", // 虚拟IPv6地址
|
||||
"tcpWhitelistEnable": false, // 启用TCP白名单
|
||||
"udpWhitelistEnable": false, // 启用UDP白名单
|
||||
"tcpWhitelist": "", // TCP端口白名单,格式为 "80" 或者 范围 "8000-9000"
|
||||
"udpWhitelist": "", // UDP端口白名单,格式为 "53" 或者 范围 "5000-6000"
|
||||
"connectAfterStart": false, // 启动后自动连接
|
||||
"disableIpv6": false, // 禁用ipv6
|
||||
"disbleListenner": false, // 禁用监听
|
||||
"disableEncryption": false, // 禁用加密
|
||||
@@ -31,6 +37,11 @@
|
||||
"enableNetCardMetric": true, // 启用自定义网卡跃点
|
||||
"netCardMetricValue": 1, // 网卡跃点
|
||||
"enablePreventSleep": false, // 启用防止睡眠
|
||||
"enableUdpBroadcastRelay": true, // Windows UDP广播中继
|
||||
"enableUpnp": true, // UPnP端口映射
|
||||
"ipv6PublicAddrProvider": false, // 公网IPv6地址前缀提供
|
||||
"ipv6PublicAddrAuto": false, // 公网IPv6地址自动获取
|
||||
"disableRelayData": false, // 禁用Relay数据转发
|
||||
"compression": "none", // 压缩算法
|
||||
"enableKcpProxy": true, // 启用kcp代理,就不能启用quic代理
|
||||
"disableKcpInput": false, // 禁用kcp输入
|
||||
|
||||
Binary file not shown.
Binary file not shown.
+111
-39
@@ -1,7 +1,7 @@
|
||||
use reqwest::{Client, Error};
|
||||
// use futures_util::StreamExt;
|
||||
use serde::{Deserialize, Serialize};
|
||||
use std::collections::HashMap;
|
||||
use serde::{Deserialize};
|
||||
// use std::collections::HashMap;
|
||||
use std::fs::{self, File};
|
||||
use std::io::{BufRead, BufReader, Write};
|
||||
use std::os::windows::process::CommandExt;
|
||||
@@ -13,7 +13,6 @@ use sysinfo::System;
|
||||
use tauri::tray::{MouseButton, MouseButtonState, TrayIconBuilder, TrayIconEvent};
|
||||
use tauri::Emitter;
|
||||
use tauri::Manager;
|
||||
use windows::Win32::System::Variant::VARIANT;
|
||||
use windows::core::{Interface, BSTR};
|
||||
use windows::Win32::Foundation::VARIANT_BOOL;
|
||||
use windows::Win32::NetworkManagement::IpHelper::{
|
||||
@@ -22,6 +21,7 @@ use windows::Win32::NetworkManagement::IpHelper::{
|
||||
use windows::Win32::Networking::WinSock::AF_UNSPEC;
|
||||
use windows::Win32::System::Com::*;
|
||||
use windows::Win32::System::TaskScheduler::*;
|
||||
use windows::Win32::System::Variant::VARIANT;
|
||||
// use std::ffi::CStr;
|
||||
|
||||
use windows::Win32::System::Power::SetThreadExecutionState;
|
||||
@@ -237,42 +237,13 @@ fn get_tool_exe_path(path: &str) -> String {
|
||||
return tool_path;
|
||||
}
|
||||
|
||||
#[derive(Serialize, Deserialize, Debug)]
|
||||
struct RoutePeerInfo {
|
||||
peer_id: u64,
|
||||
cost: u64,
|
||||
hostname: Option<String>,
|
||||
udp_stun_info: String,
|
||||
easytier_version: String,
|
||||
network_length: u64,
|
||||
}
|
||||
|
||||
#[derive(Serialize, Deserialize, Debug)]
|
||||
struct RouteTable {
|
||||
peer_infos: HashMap<u32, RoutePeerInfo>,
|
||||
ipv4_peer_id_map: HashMap<String, u64>,
|
||||
}
|
||||
|
||||
#[derive(Serialize, Deserialize, Debug)]
|
||||
struct PeerRouteServiceImpl {
|
||||
route_table_with_cost: RouteTable,
|
||||
}
|
||||
|
||||
#[derive(Serialize, Deserialize, Debug)]
|
||||
struct PeerRoute {
|
||||
my_peer_id: u64,
|
||||
service_impl: PeerRouteServiceImpl,
|
||||
}
|
||||
|
||||
#[derive(Serialize, Deserialize, Debug)]
|
||||
struct MyResponse {
|
||||
response: PeerRoute,
|
||||
}
|
||||
|
||||
#[tauri::command(rename_all = "snake_case")]
|
||||
async fn get_members_by_cli() -> String {
|
||||
let cli_path = get_tool_exe_path("\\easytier\\easytier-cli.exe");
|
||||
match tokioCommand::new(&cli_path)
|
||||
.arg("-o")
|
||||
.arg("json")
|
||||
.arg("peer")
|
||||
.arg("list")
|
||||
.creation_flags(0x08000000)
|
||||
@@ -296,10 +267,69 @@ async fn get_members_by_cli() -> String {
|
||||
}
|
||||
}
|
||||
|
||||
#[tauri::command(rename_all = "snake_case")]
|
||||
async fn get_members_proxy() -> String {
|
||||
let cli_path = get_tool_exe_path("\\easytier\\easytier-cli.exe");
|
||||
match tokioCommand::new(&cli_path)
|
||||
.arg("-o")
|
||||
.arg("json")
|
||||
.arg("proxy")
|
||||
.creation_flags(0x08000000)
|
||||
.output()
|
||||
.await
|
||||
{
|
||||
Ok(output) => {
|
||||
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 "_EasytierGameCliFailedToGetProxy_".to_string();
|
||||
}
|
||||
}
|
||||
Err(_e) => {
|
||||
log::error!("get member list error");
|
||||
return "".to_string();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
#[tauri::command(rename_all = "snake_case")]
|
||||
async fn get_members_connections_cli() -> String {
|
||||
let cli_path = get_tool_exe_path("\\easytier\\easytier-cli.exe");
|
||||
match tokioCommand::new(&cli_path)
|
||||
.arg("-v")
|
||||
.arg("-o")
|
||||
.arg("json")
|
||||
.arg("peer")
|
||||
.creation_flags(0x08000000)
|
||||
.output()
|
||||
.await
|
||||
{
|
||||
Ok(output) => {
|
||||
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 "_EasytierGameCliFailedToGetConnections_".to_string();
|
||||
}
|
||||
}
|
||||
Err(_e) => {
|
||||
log::error!("get member list error");
|
||||
return "".to_string();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
#[tauri::command(rename_all = "snake_case")]
|
||||
async fn get_route_by_cli() -> String {
|
||||
let cli_path = get_tool_exe_path("\\easytier\\easytier-cli.exe");
|
||||
match tokioCommand::new(&cli_path)
|
||||
.arg("-o")
|
||||
.arg("json")
|
||||
.arg("route")
|
||||
.creation_flags(0x08000000)
|
||||
.output()
|
||||
@@ -322,6 +352,39 @@ async fn get_route_by_cli() -> String {
|
||||
}
|
||||
}
|
||||
|
||||
#[tauri::command(rename_all = "snake_case")]
|
||||
async fn fetch_nodes_list(page: u64, limit: u64) -> String {
|
||||
let client = Client::new();
|
||||
let url = format!("https://uptime.easytier.cn/api/nodes?page={}&per_page={}", page, limit);
|
||||
let user_agent = generate_random_user_agent();
|
||||
|
||||
match client
|
||||
.get(url)
|
||||
.header("User-Agent", user_agent)
|
||||
.send()
|
||||
.await
|
||||
{
|
||||
Ok(response) => {
|
||||
if response.status().is_success() {
|
||||
match response.text().await {
|
||||
Ok(text) => text,
|
||||
Err(e) => {
|
||||
log::error!("Failed to get response text: {}", e);
|
||||
format!("_EasytierGameFetchNodesError_: {}", e)
|
||||
}
|
||||
}
|
||||
} else {
|
||||
log::error!("HTTP request failed with status: {}", response.status());
|
||||
format!("_EasytierGameFetchNodesError_: HTTP request failed with status: {}", response.status())
|
||||
}
|
||||
}
|
||||
Err(e) => {
|
||||
log::error!("Failed to fetch nodes list: {}", e);
|
||||
format!("_EasytierGameFetchNodesError_: {}", e)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
#[tauri::command(rename_all = "snake_case")]
|
||||
async fn download_easytier_zip(
|
||||
app_handle: tauri::AppHandle,
|
||||
@@ -351,6 +414,12 @@ async fn download_easytier_zip(
|
||||
|
||||
let path = path::Path::new(&file_path);
|
||||
println!("download easytier to {}", path.display());
|
||||
if path.exists() {
|
||||
match fs::remove_file(path) {
|
||||
Ok(_) => println!("删除上次下载的Zip文件成功"),
|
||||
Err(_) => log::error!("删除上次下载Zip的文件失败"),
|
||||
}
|
||||
}
|
||||
|
||||
let mut file = match File::create(&path) {
|
||||
Err(why) => panic!("couldn't create {}", why),
|
||||
@@ -652,11 +721,11 @@ fn autostart_enabled() -> Result<bool, Box<dyn std::error::Error>> {
|
||||
fn autostart_is_enabled() -> bool {
|
||||
match autostart_enabled() {
|
||||
Ok(enabled) => {
|
||||
println!("autostart enabled: {}", enabled);
|
||||
// println!("autostart enabled: {}", enabled);
|
||||
return enabled;
|
||||
}
|
||||
Err(e) => {
|
||||
log::error!("autostart enabled: false -> {}", e);
|
||||
Err(_e) => {
|
||||
// log::error!("autostart enabled: false -> {}", e);
|
||||
return false;
|
||||
}
|
||||
}
|
||||
@@ -774,7 +843,7 @@ fn autostart(enabled: bool) -> std::result::Result<(), Box<dyn std::error::Error
|
||||
exec_action.SetPath(&BSTR::from(exe_path))?;
|
||||
exec_action.SetArguments(&BSTR::from("--task-auto-start"))?;
|
||||
|
||||
// 使用当前用户运行
|
||||
// 设置任务权限为当前用户
|
||||
let principal = task_definition.Principal()?;
|
||||
principal.SetUserId(&BSTR::from(whoami::username().as_str()))?;
|
||||
principal.SetLogonType(TASK_LOGON_INTERACTIVE_TOKEN)?;
|
||||
@@ -783,7 +852,7 @@ fn autostart(enabled: bool) -> std::result::Result<(), Box<dyn std::error::Error
|
||||
// 设置任务设置
|
||||
let settings = task_definition.Settings()?;
|
||||
settings.SetEnabled(VARIANT_BOOL::from(true))?;
|
||||
settings.SetCompatibility(TASK_COMPATIBILITY_V2)?; // Windows 7
|
||||
settings.SetCompatibility(TASK_COMPATIBILITY_V2_1)?; // Windows 7
|
||||
settings.SetStartWhenAvailable(VARIANT_BOOL::from(true))?;
|
||||
// settings.SetHidden(VARIANT_BOOL::from(true))?; // 注释掉让任务可见
|
||||
settings.SetExecutionTimeLimit(&BSTR::from("PT0S"))?;
|
||||
@@ -887,7 +956,10 @@ pub fn run() {
|
||||
fetch_game_releases,
|
||||
download_easytier_zip,
|
||||
get_members_by_cli,
|
||||
get_members_connections_cli,
|
||||
get_members_proxy,
|
||||
get_route_by_cli,
|
||||
fetch_nodes_list,
|
||||
search_pid_by_pname,
|
||||
get_exe_directory,
|
||||
spawn_autostart,
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
{
|
||||
"$schema": "../node_modules/@tauri-apps/cli/config.schema.json",
|
||||
"productName": "easytier-game",
|
||||
"version": "1.4.8",
|
||||
"version": "1.5.5",
|
||||
"identifier": "com.tauri.easytier-game",
|
||||
|
||||
"build": {
|
||||
@@ -12,7 +12,7 @@
|
||||
"app": {
|
||||
"windows": [
|
||||
{
|
||||
"title": "easytier-game 1.4.8",
|
||||
"title": "easytier-game 1.5.5",
|
||||
"label": "main",
|
||||
"minWidth": 340,
|
||||
"width": 340,
|
||||
@@ -72,7 +72,9 @@
|
||||
"windows": {
|
||||
"webviewInstallMode": {
|
||||
"type": "embedBootstrapper"
|
||||
}
|
||||
},
|
||||
"wix": null,
|
||||
"nsis": null
|
||||
},
|
||||
"createUpdaterArtifacts": false,
|
||||
"icon": ["icons/icon.png", "icons/icon.rgba", "icons/icon.icns", "icons/icon.ico"]
|
||||
|
||||
+17
-2
@@ -7,7 +7,7 @@ const store = defineStore("main", {
|
||||
return {
|
||||
config: {
|
||||
protocol: ["tcp"], // 网络协议
|
||||
serverUrl: "public.easytier.top:11010",
|
||||
serverUrl: ["public.easytier.top:11010"],
|
||||
networkName: "",
|
||||
networkPassword: "",
|
||||
hostname: "",
|
||||
@@ -21,7 +21,7 @@ const store = defineStore("main", {
|
||||
autoStart: false, // 是否自动启动
|
||||
connectAfterStart: false, //软件打开后,是否自动连接
|
||||
disableIpv6: false, // 是否禁用IPv6
|
||||
port: "11010", // 监听端口号
|
||||
port: "0", // 监听端口号
|
||||
enableCustomListener: true, // 是否自定义监听
|
||||
customListenerData: "tcp://0.0.0.0:11010\nudp://0.0.0.0:11010", // 自定义监听地址
|
||||
disbleListenner: false, // 是否禁用监听
|
||||
@@ -44,6 +44,11 @@ const store = defineStore("main", {
|
||||
enableNetCardMetric: true, //启用网卡自定义跃点
|
||||
netCardMetricValue: 1, //自定义网卡跃点值
|
||||
enablePreventSleep: false, //组织系统休眠
|
||||
enableUdpBroadcastRelay: true, //Windows UDP广播中继
|
||||
enableUpnp: true, //UPnP端口映射
|
||||
ipv6PublicAddrProvider: false, //公网IPv6地址前缀提供
|
||||
ipv6PublicAddrAuto: false, //公网IPv6地址自动获取
|
||||
disableRelayData: false, //禁用Relay数据转发
|
||||
compression: "none", //加密算法
|
||||
enableKcpProxy: true, //启用kcp代理 默认开启
|
||||
disableKcpInput: false, //禁用kcp输入
|
||||
@@ -66,6 +71,8 @@ const store = defineStore("main", {
|
||||
privateMode: false, //是否启用私有模式
|
||||
privateNetworkName: "", // 私有模式房间名
|
||||
privateNetworkPassword: "", // 私有模式密码
|
||||
ipv6PublicAddrProvider: false, //公网IPv6地址前缀提供
|
||||
disableRelayData: false, //禁用Relay数据转发
|
||||
},
|
||||
cidrEnable: false,
|
||||
proxyForwardBySystem: false, // 是否通过系统内核转发子网代理数据包,禁用内置NAT
|
||||
@@ -150,6 +157,12 @@ const store = defineStore("main", {
|
||||
|
||||
"config.privateMode",
|
||||
|
||||
"config.enableUdpBroadcastRelay",
|
||||
"config.enableUpnp",
|
||||
"config.ipv6PublicAddrProvider",
|
||||
"config.ipv6PublicAddrAuto",
|
||||
"config.disableRelayData",
|
||||
|
||||
"serverConfig.autoStart",
|
||||
// 'serverConfig.enableListener',
|
||||
"serverConfig.enableWhiteList",
|
||||
@@ -159,6 +172,8 @@ const store = defineStore("main", {
|
||||
"serverConfig.privateMode",
|
||||
"serverConfig.privateNetworkName",
|
||||
"serverConfig.privateNetworkPassword",
|
||||
"serverConfig.ipv6PublicAddrProvider",
|
||||
"serverConfig.disableRelayData",
|
||||
|
||||
"cidrEnable",
|
||||
"proxyForwardBySystem",
|
||||
|
||||
Vendored
+109
@@ -10,3 +10,112 @@ interface ImportMetaEnv {
|
||||
interface ImportMeta {
|
||||
readonly env: ImportMetaEnv;
|
||||
}
|
||||
|
||||
// 节点数据类型定义
|
||||
interface NodeItem {
|
||||
id: number;
|
||||
name: string;
|
||||
host: string;
|
||||
port: number;
|
||||
protocol: string;
|
||||
version: string;
|
||||
description: string;
|
||||
max_connections: number;
|
||||
current_connections: number;
|
||||
is_active: boolean;
|
||||
is_approved: boolean;
|
||||
allow_relay: boolean;
|
||||
network_name: string | null;
|
||||
network_secret: string | null;
|
||||
created_at: string;
|
||||
updated_at: string;
|
||||
address: string;
|
||||
usage_percentage: number;
|
||||
current_health_status: string;
|
||||
last_check_time: string;
|
||||
last_response_time: number;
|
||||
health_percentage_24h: number;
|
||||
health_record_total_counter_ring: number[];
|
||||
health_record_healthy_counter_ring: number[];
|
||||
ring_granularity: number;
|
||||
qq_number: string | null;
|
||||
wechat: string | null;
|
||||
mail: string | null;
|
||||
}
|
||||
|
||||
interface NodesData {
|
||||
items: NodeItem[];
|
||||
total: number;
|
||||
page: number;
|
||||
per_page: number;
|
||||
total_pages: number;
|
||||
}
|
||||
|
||||
interface NodesResponse {
|
||||
success: boolean;
|
||||
data: NodesData;
|
||||
error: string | null;
|
||||
message: string | null;
|
||||
}
|
||||
|
||||
type Member = {
|
||||
cidr: string;
|
||||
ipv4: string;
|
||||
hostname: string;
|
||||
cost: string;
|
||||
lat_ms: string;
|
||||
loss_rate: string;
|
||||
rx_bytes: string;
|
||||
tx_bytes: string;
|
||||
tunnel_proto: string;
|
||||
nat_type: string;
|
||||
id: string;
|
||||
version: string;
|
||||
connections_addrs: string[];
|
||||
proxy?: [string, "Connected" | "Closed"];
|
||||
};
|
||||
|
||||
type ConnectionsType = {
|
||||
route: {
|
||||
peer_id: number;
|
||||
ipv4_addr: string | null;
|
||||
next_hop_peer_id: number;
|
||||
cost: number;
|
||||
path_latency: number;
|
||||
proxy_cidrs: string[];
|
||||
hostname: string;
|
||||
stun_info: {
|
||||
udp_nat_type: number;
|
||||
tcp_nat_type: number;
|
||||
last_update_time: number;
|
||||
public_ip: string[];
|
||||
min_port: number;
|
||||
max_port: number;
|
||||
};
|
||||
};
|
||||
peer: {
|
||||
peer_id: number;
|
||||
conns: {
|
||||
conn_id: string;
|
||||
my_peer_id: number;
|
||||
peer_id: number;
|
||||
features: string[];
|
||||
tunnel: {
|
||||
tunnel_type: string;
|
||||
local_addr: {
|
||||
url: string;
|
||||
};
|
||||
remote_addr: {
|
||||
url: string;
|
||||
};
|
||||
};
|
||||
}[];
|
||||
};
|
||||
};
|
||||
type Proxy = {
|
||||
src: string;
|
||||
dst: string;
|
||||
start_time: string;
|
||||
state: "Connected" | "Closed";
|
||||
transport_type: string;
|
||||
};
|
||||
|
||||
+54
-9
@@ -2,11 +2,18 @@ import { invoke } from "@tauri-apps/api/core";
|
||||
import { writeText } from "@tauri-apps/plugin-clipboard-manager";
|
||||
import { open } from "@tauri-apps/plugin-shell";
|
||||
import { ElMessage } from "element-plus";
|
||||
import { flatMap, map } from "lodash-es";
|
||||
import { customRef, ref } from "vue";
|
||||
|
||||
export const ENV = import.meta.env;
|
||||
|
||||
export const mixedArray = (a: Array<string>, b: Array<string>, split: string = "") => {
|
||||
return flatMap(a, protocol => map(b, port => `${protocol}${split}${port}`));
|
||||
};
|
||||
|
||||
//防抖
|
||||
export const bounce = (time = 3000) => {
|
||||
let bounceTimer: NodeJS.Timeout | null = null;
|
||||
let bounceTimer: number | null = null;
|
||||
return (cb: Function) => {
|
||||
bounceTimer && clearTimeout(bounceTimer);
|
||||
bounceTimer = setTimeout(() => {
|
||||
@@ -15,6 +22,26 @@ export const bounce = (time = 3000) => {
|
||||
};
|
||||
};
|
||||
|
||||
export const inputBounceRef = (value: string, cb?: Function, delay = 650) => {
|
||||
let timeout: number | null = null;
|
||||
return customRef((track, trigger) => {
|
||||
return {
|
||||
get() {
|
||||
track();
|
||||
return value;
|
||||
},
|
||||
set(newValue) {
|
||||
value = newValue;
|
||||
trigger();
|
||||
timeout && clearTimeout(timeout);
|
||||
timeout = setTimeout(() => {
|
||||
cb?.(newValue);
|
||||
}, delay);
|
||||
}
|
||||
};
|
||||
});
|
||||
};
|
||||
|
||||
/**
|
||||
*
|
||||
* @param {number} size byte number
|
||||
@@ -67,13 +94,13 @@ export const ATJ = (promise: Promise<any>, errorExt: string | undefined = undefi
|
||||
});
|
||||
};
|
||||
|
||||
const _supportProtocols = ["tcp", "udp", "ws", "wss"];
|
||||
const _supportProtocols = ["tcp", "udp", "ws", "wss", "srv", "schema", "txt"];
|
||||
|
||||
export const supportProtocols = () => {
|
||||
return _supportProtocols.slice();
|
||||
};
|
||||
|
||||
let _prevent_timer: NodeJS.Timeout | null = null;
|
||||
let _prevent_timer: number | null = null;
|
||||
let _prevent_timer_count = 15; // 秒
|
||||
export const preventSleep = () => {
|
||||
_prevent_timer && clearInterval(_prevent_timer);
|
||||
@@ -127,17 +154,35 @@ export const parseCliInfo = (content: string) => {
|
||||
};
|
||||
|
||||
export function isValidWindowsFileName(name: string) {
|
||||
if(name.length > 255) return false;
|
||||
if (name.length > 255) return false;
|
||||
const reserved_names = [
|
||||
"CON", "PRN", "AUX", "NUL",
|
||||
"COM1", "COM2", "COM3", "COM4", "COM5", "COM6", "COM7", "COM8", "COM9",
|
||||
"LPT1", "LPT2", "LPT3", "LPT4", "LPT5", "LPT6", "LPT7", "LPT8", "LPT9"
|
||||
"CON",
|
||||
"PRN",
|
||||
"AUX",
|
||||
"NUL",
|
||||
"COM1",
|
||||
"COM2",
|
||||
"COM3",
|
||||
"COM4",
|
||||
"COM5",
|
||||
"COM6",
|
||||
"COM7",
|
||||
"COM8",
|
||||
"COM9",
|
||||
"LPT1",
|
||||
"LPT2",
|
||||
"LPT3",
|
||||
"LPT4",
|
||||
"LPT5",
|
||||
"LPT6",
|
||||
"LPT7",
|
||||
"LPT8",
|
||||
"LPT9"
|
||||
];
|
||||
if(reserved_names.includes(name.toUpperCase())) {
|
||||
if (reserved_names.includes(name.toUpperCase())) {
|
||||
return false;
|
||||
}
|
||||
return /^[^<>:"/\\|?*\x00-\x1F]+[^<>:"/\\|?*\x00-\x1F .]$/g.test(name);
|
||||
|
||||
}
|
||||
|
||||
export const addQQGroup = () => {
|
||||
|
||||
Binary file not shown.
Reference in New Issue
Block a user