Compare commits

..
3 Commits
13 changed files with 937 additions and 289 deletions
+7 -7
View File
@@ -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();
}
});
}
+1 -1
View File
@@ -3,7 +3,7 @@
"private": true,
"author": "leizi97",
"description": "A simple network initiator based on Easytier",
"version": "1.4.9",
"version": "1.5.0",
"scripts": {
"dev": "nuxt dev --dotenv env/.env.dev --host 0.0.0.0",
"build": "nuxt generate --dotenv env/.env.prod",
+172 -1
View File
@@ -101,7 +101,7 @@
type="primary"
size="small"
underline="never"
@click.stop="open(publicPeersLink)"
@click.stop="handleShowPublicServersDialog"
>
其他公共服务器
</ElLink>
@@ -804,6 +804,9 @@
},
async () => {
await handleReconnect();
},
async () => {
await handleShowPublicServersDialog();
}
);
@@ -817,6 +820,7 @@
advanceVisible: false,
toolVisible: false,
gameListVisible: false,
nodesListVisible: false,
serverVisible: false,
winipBcPid: 0, //WinIPBroadcast进程id
winipBcStart: false,
@@ -1146,6 +1150,28 @@
// 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);
@@ -1359,12 +1385,154 @@
});
};
// 节点参数含义解析:
// - is_active: 节点是否激活运行
// - is_approved: 节点是否被管理员批准
// - allow_relay: 是否允许中继转发
// - current_health_status: 当前健康状态 ("healthy", "unhealthy", "unknown")
// - usage_percentage: 使用率百分比 (0-100)
// - health_percentage_24h: 24小时健康率 (0-100)
// - last_response_time: 最后响应时间(毫秒),越小越好
// - current_connections: 当前连接数
// - max_connections: 最大连接数
// - protocol: 协议类型 ("tcp", "udp", "quic" 等)
const initNodesList = async () => {
let nodesList = await invoke<string>("fetch_nodes_list", { page: 1, limit: 1000 });
if (nodesList === "_EasytierGameFetchNodesError_") {
nodesList = "";
}
try {
const nodesListData: NodesResponse = JSON.parse(nodesList);
console.log("节点数据:", nodesListData);
if (nodesListData.success && nodesListData.data.items) {
// 过滤可用节点
const availableNodes = filterAvailableNodes(nodesListData.data.items);
console.log(`总节点数: ${nodesListData.data.items.length}, 可用节点数: ${availableNodes.length}`);
// 按优先级排序
const sortedNodes = sortNodesByPriority(availableNodes);
// 处理过滤后的节点数据
sortedNodes.forEach((node, index) => {
console.log(`${index + 1}. ${node.name} (${node.protocol}) - ${node.address}`);
console.log(
` 状态: ${node.current_health_status}, 使用率: ${node.usage_percentage.toFixed(1)}%, 响应时间: ${node.last_response_time}ms`
);
console.log(` 连接: ${node.current_connections}/${node.max_connections}, 24h健康率: ${node.health_percentage_24h}%`);
});
// 将可用节点添加到服务器列表
// addNodesToServerList(sortedNodes);
}
} catch (err) {
console.error("解析节点数据失败:", err);
}
};
// 过滤可用节点的函数
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 addNodesToServerList = (nodes: NodeItem[]) => {
// 提取服务器地址
const serverAddresses = nodes.map(node => node.address.replace(`${node.protocol}://`, ""));
// 去重并添加到基础服务器列表
const uniqueAddresses = uniq([...serverAddresses, ...mainStore.basePeers]);
mainStore.basePeers = uniqueAddresses;
// 如果当前没有选择服务器,自动选择第一个最佳节点
if (mainStore.config.serverUrl.length === 0 && serverAddresses.length > 0) {
mainStore.config.serverUrl = [serverAddresses[0]];
console.log(`自动选择最佳服务器: ${serverAddresses[0]}`);
}
console.log(`已添加 ${serverAddresses.length} 个可用服务器到列表`);
};
let logsTimer: number | null = null;
let serverLogsTimer: number | null = null;
let cidrTimer: number | null = null;
onMounted(async () => {
await compatibleInitServerUrl();
initNodesList();
await initGuiJson();
await compatibleInitAutoStart();
// await initAutoStart();
@@ -1384,6 +1552,7 @@
checkNewVersion();
}
await storageDialog();
});
// storageEventEmitter.addEventListener("localStorageChange", () => {
@@ -1396,6 +1565,7 @@
return data.configJsonSeverUrl;
});
onBeforeUnmount(() => {
unListenAll();
listenObj.unListenReleaseList && listenObj.unListenReleaseList();
@@ -1405,6 +1575,7 @@
cidrTimer && clearInterval(cidrTimer);
stopPreventSleep();
// unListenStorage && unListenStorage();
});
const getArgs = async () => {
+8 -2
View File
@@ -70,7 +70,13 @@
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
@@ -120,7 +126,7 @@
import { ATJ, parseCliInfo } from "@/utils";
import { ElConfirmDanger } from "~/utils/element";
import { getCurrentWindow } from "@tauri-apps/api/window";
import { isNaN } from "lodash-es";
import { endsWith, isNaN } from "lodash-es";
// enum NatType {
// // has NAT; but own a single public IP, port is not changed
// Unknown = 0;
+364
View File
@@ -0,0 +1,364 @@
<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_5px]">
<div class="ml-[5px] mr-auto flex flex-1">
<ElText class="text-lg font-semibold">公共服务器节点列表</ElText>
</div>
<div>
<ElButton
:loading="loading"
size="small"
type="primary"
class="mr-[5px]"
@click="refreshNodes"
>
刷新
</ElButton>
<ElButton
:disabled="selectedNodes.length === 0"
size="small"
type="success"
class="mr-[5px]"
@click="addSelectedToServerList"
>
添加选中 ({{ selectedNodes.length }})
</ElButton>
<ElTag
v-if="lastUpdateTime"
size="small"
type="info"
>
最后更新: {{ lastUpdateTime }}
</ElTag>
</div>
</div>
<div class="flex w-full flex-1 flex-wrap gap-[0] overflow-auto">
<ElTable
:data="nodes"
stripe
height="100%"
ref="tableRef"
:empty-text="loading ? '加载中...' : '暂无可用服务器'"
:default-sort="{ prop: 'last_response_time', order: 'ascending' }"
@selection-change="handleSelectionChange"
@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"
>
{{ row.last_response_time }}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="描述"
width="300"
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 } from "vue";
import { ElMessage, type TableInstance } from "element-plus";
import { dataSubscribe } from "~/composables/windows";
import { uniq } from "lodash-es";
const mainStore = useMainStore();
// 节点数据
const nodes = reactive<NodeItem[]>([]);
const loading = ref(false);
const lastUpdateTime = ref("");
const selectedNodes = ref<NodeItem[]>([]);
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 < 1000) return "success";
if (responseTime < 5000) 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;
try {
let nodesList = await invoke<string>("fetch_nodes_list", { page: 1, limit: 1000 });
if (nodesList === "_EasytierGameFetchNodesError_") {
nodesList = "";
}
if (nodesList) {
const nodesListData: NodesResponse = JSON.parse(nodesList);
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.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();
}, 10000); // 10秒刷新一次
};
// 停止定时器
const stopRefreshTimer = () => {
if (refreshTimer) {
clearInterval(refreshTimer);
refreshTimer = null;
}
};
// 处理选择变化
const handleSelectionChange = (selection: NodeItem[]) => {
selectedNodes.value = selection;
};
const handleRowClick = (row: NodeItem) => {
tableRef.value?.toggleRowSelection(row);
};
// 添加选中的服务器到主页面服务器列表
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>
+298 -273
View File
File diff suppressed because it is too large Load Diff
+1 -1
View File
@@ -1,6 +1,6 @@
[package]
name = "easytier-game"
version = "1.4.9"
version = "1.5.0"
homepage = "https://github.com/EasyTier/EasyTier"
repository = "https://github.com/EasyTier/EasytierGame"
description = "A simple network initiator based on Easytier"
Binary file not shown.
Binary file not shown.
+35
View File
@@ -269,6 +269,7 @@ 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");
@@ -324,6 +325,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,
@@ -896,6 +930,7 @@ pub fn run() {
download_easytier_zip,
get_members_by_cli,
get_route_by_cli,
fetch_nodes_list,
search_pid_by_pname,
get_exe_directory,
spawn_autostart,
+3 -3
View File
@@ -1,7 +1,7 @@
{
"$schema": "../node_modules/@tauri-apps/cli/config.schema.json",
"productName": "easytier-game",
"version": "1.4.9",
"version": "1.5.0",
"identifier": "com.tauri.easytier-game",
"build": {
@@ -12,7 +12,7 @@
"app": {
"windows": [
{
"title": "easytier-game 1.4.9",
"title": "easytier-game 1.5.0",
"label": "main",
"minWidth": 340,
"width": 340,
@@ -49,7 +49,7 @@
}
},
"bundle": {
"active": false,
"active": true,
"targets": "all",
"resources": [
"easytier/config/",
+47
View File
@@ -10,3 +10,50 @@ 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;
}
+1 -1
View File
@@ -73,7 +73,7 @@ export const ATJ = (promise: Promise<any>, errorExt: string | undefined = undefi
});
};
const _supportProtocols = ["tcp", "udp", "ws", "wss"];
const _supportProtocols = ["tcp", "udp", "ws", "wss", 'srv', 'schema'];
export const supportProtocols = () => {
return _supportProtocols.slice();