#Feature 增加共享节点子窗口供用户选择 #20 增加srv和schema协议 #25

This commit is contained in:
黑先森
2025-10-07 14:05:27 +08:00
parent ae42baa73a
commit 6f5e0a85f8
10 changed files with 843 additions and 201 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 () => {
+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>
+213 -188
View File
@@ -97,9 +97,9 @@ dependencies = [
[[package]]
name = "anstream"
version = "0.6.20"
version = "0.6.21"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3ae563653d1938f79b1ab1b5e668c87c76a9930414574a6583a7b7e11a8e6192"
checksum = "43d5b281e737544384e969a5ccad3f1cdd24b48086a0fc1b2a5262a26b8f4f4a"
dependencies = [
"anstyle",
"anstyle-parse",
@@ -169,11 +169,11 @@ dependencies = [
"clipboard-win",
"image",
"log",
"objc2 0.6.2",
"objc2 0.6.3",
"objc2-app-kit",
"objc2-core-foundation",
"objc2-core-graphics",
"objc2-foundation 0.3.1",
"objc2-foundation 0.3.2",
"parking_lot",
"percent-encoding",
"windows-sys 0.60.2",
@@ -261,7 +261,7 @@ dependencies = [
"polling",
"rustix 1.1.2",
"slab",
"windows-sys 0.61.1",
"windows-sys 0.61.2",
]
[[package]]
@@ -319,7 +319,7 @@ dependencies = [
"rustix 1.1.2",
"signal-hook-registry",
"slab",
"windows-sys 0.61.1",
"windows-sys 0.61.2",
]
[[package]]
@@ -386,7 +386,7 @@ dependencies = [
"miniz_oxide",
"object",
"rustc-demangle",
"windows-link 0.2.0",
"windows-link 0.2.1",
]
[[package]]
@@ -448,11 +448,11 @@ dependencies = [
[[package]]
name = "block2"
version = "0.6.1"
version = "0.6.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "340d2f0bdb2a43c1d3cd40513185b2bd7def0aa1052f956455114bc98f82dcf2"
checksum = "cdeb9d870516001442e364c5220d3574d2da8dc765554b4a617230d33fa58ef5"
dependencies = [
"objc2 0.6.2",
"objc2 0.6.3",
]
[[package]]
@@ -553,9 +553,9 @@ dependencies = [
[[package]]
name = "bytemuck"
version = "1.23.2"
version = "1.24.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3995eaeebcdf32f91f980d360f78732ddc061097ab4e39991ae7a6ace9194677"
checksum = "1fbdf580320f38b612e485521afda1ee26d10cc9884efaaa750d383e13e3c5f4"
[[package]]
name = "byteorder"
@@ -666,9 +666,9 @@ dependencies = [
[[package]]
name = "cc"
version = "1.2.39"
version = "1.2.40"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e1354349954c6fc9cb0deab020f27f783cf0b604e8bb754dc4658ecf0d29c35f"
checksum = "e1d05d92f4b1fd76aad469d46cdd858ca761576082cd37df81416691e50199fb"
dependencies = [
"find-msvc-tools",
"jobserver",
@@ -724,7 +724,7 @@ dependencies = [
"iana-time-zone",
"num-traits",
"serde",
"windows-link 0.2.0",
"windows-link 0.2.1",
]
[[package]]
@@ -1027,9 +1027,9 @@ dependencies = [
[[package]]
name = "deflate64"
version = "0.1.9"
version = "0.1.10"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "da692b8d1080ea3045efaab14434d40468c3d8657e42abddfffca87b428f4c1b"
checksum = "26bf8fc351c5ed29b5c2f0cbbac1b209b74f60ecd62e675a998df72c49af5204"
[[package]]
name = "deranged"
@@ -1094,7 +1094,7 @@ dependencies = [
"libc",
"option-ext",
"redox_users",
"windows-sys 0.61.1",
"windows-sys 0.61.2",
]
[[package]]
@@ -1110,9 +1110,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "89a09f22a6c6069a18470eb92d2298acf25463f14256d24778e1230d789a2aec"
dependencies = [
"bitflags 2.9.4",
"block2 0.6.1",
"block2 0.6.2",
"libc",
"objc2 0.6.2",
"objc2 0.6.3",
]
[[package]]
@@ -1202,7 +1202,7 @@ checksum = "d0881ea181b1df73ff77ffaaf9c7544ecc11e82fba9b5f27b262a3c73a332555"
[[package]]
name = "easytier-game"
version = "1.4.9"
version = "1.5.0"
dependencies = [
"hashbrown 0.15.5",
"log",
@@ -1324,7 +1324,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "39cab71617ae0d63f51a36d69f866391735b51691dbda63cf6f96d042b63efeb"
dependencies = [
"libc",
"windows-sys 0.61.1",
"windows-sys 0.61.2",
]
[[package]]
@@ -1410,9 +1410,9 @@ dependencies = [
[[package]]
name = "find-msvc-tools"
version = "0.1.2"
version = "0.1.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1ced73b1dacfc750a6db6c0a0c3a3853c8b41997e2e2c563dc90804ae6867959"
checksum = "0399f9d26e5191ce32c498bebd31e7a3ceabc2745f0ac54af3f335126c3f24b3"
[[package]]
name = "fixedbitset"
@@ -1422,9 +1422,9 @@ checksum = "0ce7134b9999ecaf8bcd65542e436736ef32ddca1b3e06094cb6ec5755203b80"
[[package]]
name = "flate2"
version = "1.1.2"
version = "1.1.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4a3d7db9596fecd151c5f638c0ee5d5bd487b6e0ea232e5dc96d5250f6f94b1d"
checksum = "dc5a4e564e38c699f2880d3fda590bedc2e69f3f84cd48b457bd892ce61d0aa9"
dependencies = [
"crc32fast",
"miniz_oxide",
@@ -2150,7 +2150,7 @@ dependencies = [
"js-sys",
"log",
"wasm-bindgen",
"windows-core 0.62.1",
"windows-core 0.62.2",
]
[[package]]
@@ -2561,7 +2561,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d7c4b02199fee7c5d21a5ae7d8cfa79a6ef5bb2fc834d6e9058e89c825efdc55"
dependencies = [
"cfg-if",
"windows-link 0.2.0",
"windows-link 0.2.1",
]
[[package]]
@@ -2595,11 +2595,10 @@ checksum = "241eaef5fd12c88705a01fc1066c48c4b36e0dd4377dcdc7ec3942cea7a69956"
[[package]]
name = "lock_api"
version = "0.4.13"
version = "0.4.14"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "96936507f153605bddfcda068dd804796c84324ed2510809e5b2a624c81da765"
checksum = "224399e74b87b5f3557511d98dff8b14089b3dadafcab6bb93eab67d3aace965"
dependencies = [
"autocfg",
"scopeguard",
]
@@ -2720,9 +2719,9 @@ dependencies = [
[[package]]
name = "moxcms"
version = "0.7.5"
version = "0.7.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ddd32fa8935aeadb8a8a6b6b351e40225570a37c43de67690383d87ef170cd08"
checksum = "1cc7d85f3d741164e8972ad355e26ac6e51b20fcae5f911c7da8f2d8bbbb3f33"
dependencies = [
"num-traits",
"pxfm",
@@ -2738,10 +2737,10 @@ dependencies = [
"dpi",
"gtk",
"keyboard-types",
"objc2 0.6.2",
"objc2 0.6.3",
"objc2-app-kit",
"objc2-core-foundation",
"objc2-foundation 0.3.1",
"objc2-foundation 0.3.2",
"once_cell",
"png 0.17.16",
"serde",
@@ -2904,9 +2903,9 @@ dependencies = [
[[package]]
name = "objc2"
version = "0.6.2"
version = "0.6.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "561f357ba7f3a2a61563a186a163d0a3a5247e1089524a3981d49adb775078bc"
checksum = "b7c2599ce0ec54857b29ce62166b0ed9b4f6f1a70ccc9a71165b6154caca8c05"
dependencies = [
"objc2-encode",
"objc2-exception-helper",
@@ -2914,77 +2913,104 @@ dependencies = [
[[package]]
name = "objc2-app-kit"
version = "0.3.1"
version = "0.3.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e6f29f568bec459b0ddff777cec4fe3fd8666d82d5a40ebd0ff7e66134f89bcc"
checksum = "d49e936b501e5c5bf01fda3a9452ff86dc3ea98ad5f283e1455153142d97518c"
dependencies = [
"bitflags 2.9.4",
"block2 0.6.1",
"block2 0.6.2",
"libc",
"objc2 0.6.2",
"objc2 0.6.3",
"objc2-cloud-kit",
"objc2-core-data",
"objc2-core-foundation",
"objc2-core-graphics",
"objc2-core-image",
"objc2-foundation 0.3.1",
"objc2-quartz-core 0.3.1",
"objc2-core-text",
"objc2-core-video",
"objc2-foundation 0.3.2",
"objc2-quartz-core 0.3.2",
]
[[package]]
name = "objc2-cloud-kit"
version = "0.3.1"
version = "0.3.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "17614fdcd9b411e6ff1117dfb1d0150f908ba83a7df81b1f118005fe0a8ea15d"
checksum = "73ad74d880bb43877038da939b7427bba67e9dd42004a18b809ba7d87cee241c"
dependencies = [
"bitflags 2.9.4",
"objc2 0.6.2",
"objc2-foundation 0.3.1",
"objc2 0.6.3",
"objc2-foundation 0.3.2",
]
[[package]]
name = "objc2-core-data"
version = "0.3.1"
version = "0.3.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "291fbbf7d29287518e8686417cf7239c74700fd4b607623140a7d4a3c834329d"
checksum = "0b402a653efbb5e82ce4df10683b6b28027616a2715e90009947d50b8dd298fa"
dependencies = [
"bitflags 2.9.4",
"objc2 0.6.2",
"objc2-foundation 0.3.1",
"objc2 0.6.3",
"objc2-foundation 0.3.2",
]
[[package]]
name = "objc2-core-foundation"
version = "0.3.1"
version = "0.3.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1c10c2894a6fed806ade6027bcd50662746363a9589d3ec9d9bef30a4e4bc166"
checksum = "2a180dd8642fa45cdb7dd721cd4c11b1cadd4929ce112ebd8b9f5803cc79d536"
dependencies = [
"bitflags 2.9.4",
"dispatch2",
"objc2 0.6.2",
"objc2 0.6.3",
]
[[package]]
name = "objc2-core-graphics"
version = "0.3.1"
version = "0.3.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "989c6c68c13021b5c2d6b71456ebb0f9dc78d752e86a98da7c716f4f9470f5a4"
checksum = "e022c9d066895efa1345f8e33e584b9f958da2fd4cd116792e15e07e4720a807"
dependencies = [
"bitflags 2.9.4",
"dispatch2",
"objc2 0.6.2",
"objc2 0.6.3",
"objc2-core-foundation",
"objc2-io-surface",
]
[[package]]
name = "objc2-core-image"
version = "0.3.1"
version = "0.3.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "79b3dc0cc4386b6ccf21c157591b34a7f44c8e75b064f85502901ab2188c007e"
checksum = "e5d563b38d2b97209f8e861173de434bd0214cf020e3423a52624cd1d989f006"
dependencies = [
"objc2 0.6.2",
"objc2-foundation 0.3.1",
"objc2 0.6.3",
"objc2-foundation 0.3.2",
]
[[package]]
name = "objc2-core-text"
version = "0.3.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0cde0dfb48d25d2b4862161a4d5fcc0e3c24367869ad306b0c9ec0073bfed92d"
dependencies = [
"bitflags 2.9.4",
"objc2 0.6.3",
"objc2-core-foundation",
"objc2-core-graphics",
]
[[package]]
name = "objc2-core-video"
version = "0.3.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d425caf1df73233f29fd8a5c3e5edbc30d2d4307870f802d18f00d83dc5141a6"
dependencies = [
"bitflags 2.9.4",
"objc2 0.6.3",
"objc2-core-foundation",
"objc2-core-graphics",
"objc2-io-surface",
]
[[package]]
@@ -3016,35 +3042,35 @@ dependencies = [
[[package]]
name = "objc2-foundation"
version = "0.3.1"
version = "0.3.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "900831247d2fe1a09a683278e5384cfb8c80c79fe6b166f9d14bfdde0ea1b03c"
checksum = "e3e0adef53c21f888deb4fa59fc59f7eb17404926ee8a6f59f5df0fd7f9f3272"
dependencies = [
"bitflags 2.9.4",
"block2 0.6.1",
"block2 0.6.2",
"libc",
"objc2 0.6.2",
"objc2 0.6.3",
"objc2-core-foundation",
]
[[package]]
name = "objc2-io-surface"
version = "0.3.1"
version = "0.3.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7282e9ac92529fa3457ce90ebb15f4ecbc383e8338060960760fa2cf75420c3c"
checksum = "180788110936d59bab6bd83b6060ffdfffb3b922ba1396b312ae795e1de9d81d"
dependencies = [
"bitflags 2.9.4",
"objc2 0.6.2",
"objc2 0.6.3",
"objc2-core-foundation",
]
[[package]]
name = "objc2-javascript-core"
version = "0.3.1"
version = "0.3.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9052cb1bb50a4c161d934befcf879526fb87ae9a68858f241e693ca46225cf5a"
checksum = "2a1e6550c4caed348956ce3370c9ffeca70bb1dbed4fa96112e7c6170e074586"
dependencies = [
"objc2 0.6.2",
"objc2 0.6.3",
"objc2-core-foundation",
]
@@ -3075,50 +3101,50 @@ dependencies = [
[[package]]
name = "objc2-quartz-core"
version = "0.3.1"
version = "0.3.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "90ffb6a0cd5f182dc964334388560b12a57f7b74b3e2dec5e2722aa2dfb2ccd5"
checksum = "96c1358452b371bf9f104e21ec536d37a650eb10f7ee379fff67d2e08d537f1f"
dependencies = [
"bitflags 2.9.4",
"objc2 0.6.2",
"objc2-foundation 0.3.1",
"objc2 0.6.3",
"objc2-foundation 0.3.2",
]
[[package]]
name = "objc2-security"
version = "0.3.1"
version = "0.3.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e1f8e0ef3ab66b08c42644dcb34dba6ec0a574bbd8adbb8bdbdc7a2779731a44"
checksum = "709fe137109bd1e8b5a99390f77a7d8b2961dafc1a1c5db8f2e60329ad6d895a"
dependencies = [
"bitflags 2.9.4",
"objc2 0.6.2",
"objc2 0.6.3",
"objc2-core-foundation",
]
[[package]]
name = "objc2-ui-kit"
version = "0.3.1"
version = "0.3.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "25b1312ad7bc8a0e92adae17aa10f90aae1fb618832f9b993b022b591027daed"
checksum = "d87d638e33c06f577498cbcc50491496a3ed4246998a7fbba7ccb98b1e7eab22"
dependencies = [
"bitflags 2.9.4",
"objc2 0.6.2",
"objc2 0.6.3",
"objc2-core-foundation",
"objc2-foundation 0.3.1",
"objc2-foundation 0.3.2",
]
[[package]]
name = "objc2-web-kit"
version = "0.3.1"
version = "0.3.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "91672909de8b1ce1c2252e95bbee8c1649c9ad9d14b9248b3d7b4c47903c47ad"
checksum = "b2e5aaab980c433cf470df9d7af96a7b46a9d892d521a2cbbb2f8a4c16751e7f"
dependencies = [
"bitflags 2.9.4",
"block2 0.6.1",
"objc2 0.6.2",
"block2 0.6.2",
"objc2 0.6.3",
"objc2-app-kit",
"objc2-core-foundation",
"objc2-foundation 0.3.1",
"objc2-foundation 0.3.2",
"objc2-javascript-core",
"objc2-security",
]
@@ -3259,9 +3285,9 @@ checksum = "f38d5652c16fde515bb1ecef450ab0f6a219d619a7274976324d5e377f7dceba"
[[package]]
name = "parking_lot"
version = "0.12.4"
version = "0.12.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "70d58bf43669b5795d1576d0641cfb6fbb2057bf629506267a92807158584a13"
checksum = "93857453250e3077bd71ff98b6a65ea6621a19bb0f559a85248955ac12c45a1a"
dependencies = [
"lock_api",
"parking_lot_core",
@@ -3269,15 +3295,15 @@ dependencies = [
[[package]]
name = "parking_lot_core"
version = "0.9.11"
version = "0.9.12"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "bc838d2a56b5b1a6c25f55575dfc605fabb63bb2365f6c2353ef9159aa69e4a5"
checksum = "2621685985a2ebf1c516881c026032ac7deafcda1a2c9b7850dc81e3dfcb64c1"
dependencies = [
"cfg-if",
"libc",
"redox_syscall",
"smallvec",
"windows-targets 0.52.6",
"windows-link 0.2.1",
]
[[package]]
@@ -3525,7 +3551,7 @@ dependencies = [
"hermit-abi",
"pin-project-lite",
"rustix 1.1.2",
"windows-sys 0.61.1",
"windows-sys 0.61.2",
]
[[package]]
@@ -3838,9 +3864,9 @@ dependencies = [
[[package]]
name = "redox_syscall"
version = "0.5.17"
version = "0.5.18"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5407465600fb0548f1442edf71dd20683c6ed326200ace4b1ef0763521bb3b77"
checksum = "ed2bf2547551a7053d6fdfafda3f938979645c44812fbfcda098faae3f1a362d"
dependencies = [
"bitflags 2.9.4",
]
@@ -3964,17 +3990,17 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ef2bee61e6cffa4635c72d7d81a84294e28f0930db0ddcb0f66d10244674ebed"
dependencies = [
"ashpd",
"block2 0.6.1",
"block2 0.6.2",
"dispatch2",
"glib-sys",
"gobject-sys",
"gtk-sys",
"js-sys",
"log",
"objc2 0.6.2",
"objc2 0.6.3",
"objc2-app-kit",
"objc2-core-foundation",
"objc2-foundation 0.3.1",
"objc2-foundation 0.3.2",
"raw-window-handle",
"wasm-bindgen",
"wasm-bindgen-futures",
@@ -4079,7 +4105,7 @@ dependencies = [
"errno",
"libc",
"linux-raw-sys 0.11.0",
"windows-sys 0.61.1",
"windows-sys 0.61.2",
]
[[package]]
@@ -4106,9 +4132,9 @@ dependencies = [
[[package]]
name = "rustls-webpki"
version = "0.103.6"
version = "0.103.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8572f3c2cb9934231157b45499fc41e1f58c589fdfb81a844ba873265e80f8eb"
checksum = "e10b3f4191e8a80e6b43eebabfac91e5dcecebb27a71f04e820c47ec41d314bf"
dependencies = [
"ring",
"rustls-pki-types",
@@ -4142,7 +4168,7 @@ version = "0.1.28"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "891d81b926048e76efe18581bf793546b4c0eaf8448d72be8de2bbee5fd166e1"
dependencies = [
"windows-sys 0.61.1",
"windows-sys 0.61.2",
]
[[package]]
@@ -4374,9 +4400,9 @@ dependencies = [
[[package]]
name = "serde_with"
version = "3.14.1"
version = "3.15.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c522100790450cf78eeac1507263d0a350d4d5b30df0c8e1fe051a10c22b376e"
checksum = "6093cd8c01b25262b84927e0f7151692158fab02d961e04c979d3903eba7ecc5"
dependencies = [
"base64 0.22.1",
"chrono",
@@ -4385,8 +4411,7 @@ dependencies = [
"indexmap 2.11.4",
"schemars 0.9.0",
"schemars 1.0.4",
"serde",
"serde_derive",
"serde_core",
"serde_json",
"serde_with_macros",
"time",
@@ -4394,9 +4419,9 @@ dependencies = [
[[package]]
name = "serde_with_macros"
version = "3.14.1"
version = "3.15.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "327ada00f7d64abaac1e55a6911e90cf665aa051b9a561c7006c157f4633135e"
checksum = "a7e6c180db0816026a61afa1cff5344fb7ebded7e4d3062772179f2501481c27"
dependencies = [
"darling",
"proc-macro2",
@@ -4756,7 +4781,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "959469667dbcea91e5485fc48ba7dd6023face91bb0f1a14681a70f99847c3f7"
dependencies = [
"bitflags 2.9.4",
"block2 0.6.1",
"block2 0.6.2",
"core-foundation 0.10.1",
"core-graphics",
"crossbeam-channel",
@@ -4773,9 +4798,9 @@ dependencies = [
"ndk",
"ndk-context",
"ndk-sys",
"objc2 0.6.2",
"objc2 0.6.3",
"objc2-app-kit",
"objc2-foundation 0.3.1",
"objc2-foundation 0.3.2",
"once_cell",
"parking_lot",
"raw-window-handle",
@@ -4836,9 +4861,9 @@ dependencies = [
"log",
"mime",
"muda",
"objc2 0.6.2",
"objc2 0.6.3",
"objc2-app-kit",
"objc2-foundation 0.3.1",
"objc2-foundation 0.3.2",
"objc2-ui-kit",
"objc2-web-kit",
"percent-encoding",
@@ -5026,8 +5051,8 @@ dependencies = [
"byte-unit",
"fern",
"log",
"objc2 0.6.2",
"objc2-foundation 0.3.1",
"objc2 0.6.3",
"objc2-foundation 0.3.2",
"serde",
"serde_json",
"serde_repr",
@@ -5100,7 +5125,7 @@ dependencies = [
"gtk",
"http",
"jni",
"objc2 0.6.2",
"objc2 0.6.3",
"objc2-ui-kit",
"objc2-web-kit",
"raw-window-handle",
@@ -5124,9 +5149,9 @@ dependencies = [
"http",
"jni",
"log",
"objc2 0.6.2",
"objc2 0.6.3",
"objc2-app-kit",
"objc2-foundation 0.3.1",
"objc2-foundation 0.3.2",
"once_cell",
"percent-encoding",
"raw-window-handle",
@@ -5199,7 +5224,7 @@ dependencies = [
"getrandom 0.3.3",
"once_cell",
"rustix 1.1.2",
"windows-sys 0.61.1",
"windows-sys 0.61.2",
]
[[package]]
@@ -5564,11 +5589,11 @@ dependencies = [
"dirs",
"libappindicator",
"muda",
"objc2 0.6.2",
"objc2 0.6.3",
"objc2-app-kit",
"objc2-core-foundation",
"objc2-core-graphics",
"objc2-foundation 0.3.1",
"objc2-foundation 0.3.2",
"once_cell",
"png 0.17.16",
"serde",
@@ -5602,9 +5627,9 @@ checksum = "bc7d623258602320d5c55d1bc22793b57daff0ec7efc270ea7d55ce1d5f5471c"
[[package]]
name = "typenum"
version = "1.18.0"
version = "1.19.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1dccffe3ce07af9386bfd29e80c0ab1a8205a2fc34e4bcd40364df902cfa8f3f"
checksum = "562d481066bde0658276a35467c4af00bdc6ee726305698a55b86e61d7ad82bb"
[[package]]
name = "uds_windows"
@@ -6057,8 +6082,8 @@ dependencies = [
"webview2-com-sys",
"windows 0.61.3",
"windows-core 0.61.2",
"windows-implement 0.60.1",
"windows-interface 0.59.2",
"windows-implement 0.60.2",
"windows-interface 0.59.3",
]
[[package]]
@@ -6122,7 +6147,7 @@ version = "0.1.11"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c2a7b1c03c876122aa43f3020e6c3c3ee5c05081c9a00739faf7503aeba10d22"
dependencies = [
"windows-sys 0.61.1",
"windows-sys 0.61.2",
]
[[package]]
@@ -6137,10 +6162,10 @@ version = "0.6.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d9bec5a31f3f9362f2258fd0e9c9dd61a9ca432e7306cc78c444258f0dce9a9c"
dependencies = [
"objc2 0.6.2",
"objc2 0.6.3",
"objc2-app-kit",
"objc2-core-foundation",
"objc2-foundation 0.3.1",
"objc2-foundation 0.3.2",
"raw-window-handle",
"windows-sys 0.59.0",
"windows-version",
@@ -6196,8 +6221,8 @@ version = "0.61.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c0fdd3ddb90610c7638aa2b3a3ab2904fb9e5cdbecc643ddb3647212781c4ae3"
dependencies = [
"windows-implement 0.60.1",
"windows-interface 0.59.2",
"windows-implement 0.60.2",
"windows-interface 0.59.3",
"windows-link 0.1.3",
"windows-result 0.3.4",
"windows-strings 0.4.2",
@@ -6205,15 +6230,15 @@ dependencies = [
[[package]]
name = "windows-core"
version = "0.62.1"
version = "0.62.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6844ee5416b285084d3d3fffd743b925a6c9385455f64f6d4fa3031c4c2749a9"
checksum = "b8e83a14d34d0623b51dce9581199302a221863196a1dde71a7663a4c2be9deb"
dependencies = [
"windows-implement 0.60.1",
"windows-interface 0.59.2",
"windows-link 0.2.0",
"windows-result 0.4.0",
"windows-strings 0.5.0",
"windows-implement 0.60.2",
"windows-interface 0.59.3",
"windows-link 0.2.1",
"windows-result 0.4.1",
"windows-strings 0.5.1",
]
[[package]]
@@ -6240,9 +6265,9 @@ dependencies = [
[[package]]
name = "windows-implement"
version = "0.60.1"
version = "0.60.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "edb307e42a74fb6de9bf3a02d9712678b22399c87e6fa869d6dfcd8c1b7754e0"
checksum = "053e2e040ab57b9dc951b72c264860db7eb3b0200ba345b4e4c3b14f67855ddf"
dependencies = [
"proc-macro2",
"quote",
@@ -6262,9 +6287,9 @@ dependencies = [
[[package]]
name = "windows-interface"
version = "0.59.2"
version = "0.59.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c0abd1ddbc6964ac14db11c7213d6532ef34bd9aa042c2e5935f59d7908b46a5"
checksum = "3f316c4a2570ba26bbec722032c4099d8c8bc095efccdc15688708623367e358"
dependencies = [
"proc-macro2",
"quote",
@@ -6279,9 +6304,9 @@ checksum = "5e6ad25900d524eaabdbbb96d20b4311e1e7ae1699af4fb28c17ae66c80d798a"
[[package]]
name = "windows-link"
version = "0.2.0"
version = "0.2.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "45e46c0661abb7180e7b9c281db115305d49ca1709ab8242adf09666d2173c65"
checksum = "f0805222e57f7521d6a62e36fa9163bc891acd422f971defe97d64e70d0a4fe5"
[[package]]
name = "windows-numerics"
@@ -6324,11 +6349,11 @@ dependencies = [
[[package]]
name = "windows-result"
version = "0.4.0"
version = "0.4.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7084dcc306f89883455a206237404d3eaf961e5bd7e0f312f7c91f57eb44167f"
checksum = "7781fa89eaf60850ac3d2da7af8e5242a5ea78d1a11c49bf2910bb5a73853eb5"
dependencies = [
"windows-link 0.2.0",
"windows-link 0.2.1",
]
[[package]]
@@ -6342,11 +6367,11 @@ dependencies = [
[[package]]
name = "windows-strings"
version = "0.5.0"
version = "0.5.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7218c655a553b0bed4426cf54b20d7ba363ef543b52d515b3e48d7fd55318dda"
checksum = "7837d08f69c77cf6b07689544538e017c1bfcf57e34b4c0ff58e6c2cd3b37091"
dependencies = [
"windows-link 0.2.0",
"windows-link 0.2.1",
]
[[package]]
@@ -6382,16 +6407,16 @@ version = "0.60.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f2f500e4d28234f72040990ec9d39e3a6b950f9f22d3dba18416c35882612bcb"
dependencies = [
"windows-targets 0.53.4",
"windows-targets 0.53.5",
]
[[package]]
name = "windows-sys"
version = "0.61.1"
version = "0.61.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6f109e41dd4a3c848907eb83d5a42ea98b3769495597450cf6d153507b166f0f"
checksum = "ae137229bcbd6cdf0f7b80a31df61766145077ddf49416a728b02cb3921ff3fc"
dependencies = [
"windows-link 0.2.0",
"windows-link 0.2.1",
]
[[package]]
@@ -6427,19 +6452,19 @@ dependencies = [
[[package]]
name = "windows-targets"
version = "0.53.4"
version = "0.53.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2d42b7b7f66d2a06854650af09cfdf8713e427a439c97ad65a6375318033ac4b"
checksum = "4945f9f551b88e0d65f3db0bc25c33b8acea4d9e41163edf90dcd0b19f9069f3"
dependencies = [
"windows-link 0.2.0",
"windows_aarch64_gnullvm 0.53.0",
"windows_aarch64_msvc 0.53.0",
"windows_i686_gnu 0.53.0",
"windows_i686_gnullvm 0.53.0",
"windows_i686_msvc 0.53.0",
"windows_x86_64_gnu 0.53.0",
"windows_x86_64_gnullvm 0.53.0",
"windows_x86_64_msvc 0.53.0",
"windows-link 0.2.1",
"windows_aarch64_gnullvm 0.53.1",
"windows_aarch64_msvc 0.53.1",
"windows_i686_gnu 0.53.1",
"windows_i686_gnullvm 0.53.1",
"windows_i686_msvc 0.53.1",
"windows_x86_64_gnu 0.53.1",
"windows_x86_64_gnullvm 0.53.1",
"windows_x86_64_msvc 0.53.1",
]
[[package]]
@@ -6453,11 +6478,11 @@ dependencies = [
[[package]]
name = "windows-version"
version = "0.1.6"
version = "0.1.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "700dad7c058606087f6fdc1f88da5841e06da40334413c6cd4367b25ef26d24e"
checksum = "e4060a1da109b9d0326b7262c8e12c84df67cc0dbc9e33cf49e01ccc2eb63631"
dependencies = [
"windows-link 0.2.0",
"windows-link 0.2.1",
]
[[package]]
@@ -6474,9 +6499,9 @@ checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3"
[[package]]
name = "windows_aarch64_gnullvm"
version = "0.53.0"
version = "0.53.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "86b8d5f90ddd19cb4a147a5fa63ca848db3df085e25fee3cc10b39b6eebae764"
checksum = "a9d8416fa8b42f5c947f8482c43e7d89e73a173cead56d044f6a56104a6d1b53"
[[package]]
name = "windows_aarch64_msvc"
@@ -6492,9 +6517,9 @@ checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469"
[[package]]
name = "windows_aarch64_msvc"
version = "0.53.0"
version = "0.53.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c7651a1f62a11b8cbd5e0d42526e55f2c99886c77e007179efff86c2b137e66c"
checksum = "b9d782e804c2f632e395708e99a94275910eb9100b2114651e04744e9b125006"
[[package]]
name = "windows_i686_gnu"
@@ -6510,9 +6535,9 @@ checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b"
[[package]]
name = "windows_i686_gnu"
version = "0.53.0"
version = "0.53.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c1dc67659d35f387f5f6c479dc4e28f1d4bb90ddd1a5d3da2e5d97b42d6272c3"
checksum = "960e6da069d81e09becb0ca57a65220ddff016ff2d6af6a223cf372a506593a3"
[[package]]
name = "windows_i686_gnullvm"
@@ -6522,9 +6547,9 @@ checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66"
[[package]]
name = "windows_i686_gnullvm"
version = "0.53.0"
version = "0.53.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9ce6ccbdedbf6d6354471319e781c0dfef054c81fbc7cf83f338a4296c0cae11"
checksum = "fa7359d10048f68ab8b09fa71c3daccfb0e9b559aed648a8f95469c27057180c"
[[package]]
name = "windows_i686_msvc"
@@ -6540,9 +6565,9 @@ checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66"
[[package]]
name = "windows_i686_msvc"
version = "0.53.0"
version = "0.53.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "581fee95406bb13382d2f65cd4a908ca7b1e4c2f1917f143ba16efe98a589b5d"
checksum = "1e7ac75179f18232fe9c285163565a57ef8d3c89254a30685b57d83a38d326c2"
[[package]]
name = "windows_x86_64_gnu"
@@ -6558,9 +6583,9 @@ checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78"
[[package]]
name = "windows_x86_64_gnu"
version = "0.53.0"
version = "0.53.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2e55b5ac9ea33f2fc1716d1742db15574fd6fc8dadc51caab1c16a3d3b4190ba"
checksum = "9c3842cdd74a865a8066ab39c8a7a473c0778a3f29370b5fd6b4b9aa7df4a499"
[[package]]
name = "windows_x86_64_gnullvm"
@@ -6576,9 +6601,9 @@ checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d"
[[package]]
name = "windows_x86_64_gnullvm"
version = "0.53.0"
version = "0.53.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0a6e035dd0599267ce1ee132e51c27dd29437f63325753051e71dd9e42406c57"
checksum = "0ffa179e2d07eee8ad8f57493436566c7cc30ac536a3379fdf008f47f6bb7ae1"
[[package]]
name = "windows_x86_64_msvc"
@@ -6594,9 +6619,9 @@ checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec"
[[package]]
name = "windows_x86_64_msvc"
version = "0.53.0"
version = "0.53.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "271414315aff87387382ec3d271b52d7ae78726f5d44ac98b4f4030c91880486"
checksum = "d6bbff5f0aada427a1e5a6da5f1f98158182f26556f345ac9e04d36d0ebed650"
[[package]]
name = "winnow"
@@ -6659,12 +6684,12 @@ checksum = "ea2f10b9bb0928dfb1b42b65e1f9e36f7f54dbdf08457afefb38afcdec4fa2bb"
[[package]]
name = "wry"
version = "0.53.3"
version = "0.53.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "31f0e9642a0d061f6236c54ccae64c2722a7879ad4ec7dff59bd376d446d8e90"
checksum = "6d78ec082b80fa088569a970d043bb3050abaabf4454101d44514ee8d9a8c9f6"
dependencies = [
"base64 0.22.1",
"block2 0.6.1",
"block2 0.6.2",
"cookie",
"crossbeam-channel",
"dirs",
@@ -6679,10 +6704,10 @@ dependencies = [
"kuchikiki",
"libc",
"ndk",
"objc2 0.6.2",
"objc2 0.6.3",
"objc2-app-kit",
"objc2-core-foundation",
"objc2-foundation 0.3.1",
"objc2-foundation 0.3.2",
"objc2-ui-kit",
"objc2-web-kit",
"once_cell",
+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"
+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,
+2 -2
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,
+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();