diff --git a/package.json b/package.json index fb97a286d..db4e538b0 100644 --- a/package.json +++ b/package.json @@ -76,7 +76,7 @@ "react-router": "^7.9.5", "react-virtuoso": "^4.14.1", "swr": "^2.3.6", - "tauri-plugin-mihomo-api": "git+https://github.com/clash-verge-rev/tauri-plugin-mihomo", + "tauri-plugin-mihomo-api": "git+https://github.com/clash-verge-rev/tauri-plugin-mihomo#main", "types-pac": "^1.0.3" }, "devDependencies": { diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 58c073041..314a64ef5 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -129,8 +129,8 @@ importers: specifier: ^2.3.6 version: 2.3.6(react@19.2.0) tauri-plugin-mihomo-api: - specifier: git+https://github.com/clash-verge-rev/tauri-plugin-mihomo - version: https://codeload.github.com/clash-verge-rev/tauri-plugin-mihomo/tar.gz/d0f00b33cea294cc693e177441fc897426ecbc39 + specifier: git+https://github.com/clash-verge-rev/tauri-plugin-mihomo#main + version: https://codeload.github.com/clash-verge-rev/tauri-plugin-mihomo/tar.gz/1e2ada19e20c5504a2a8cef367e87c667806dd65 types-pac: specifier: ^1.0.3 version: 1.0.3 @@ -3978,8 +3978,8 @@ packages: resolution: {integrity: sha512-7NyxrTE4Anh8km8iEy7o0QYPs+0JKBTj5ZaqHg6B39erLg0qYXN3BijtShwbsNSvQ+LN75+KV+C4QR/f6Gwnpg==} engines: {node: '>=18'} - tauri-plugin-mihomo-api@https://codeload.github.com/clash-verge-rev/tauri-plugin-mihomo/tar.gz/d0f00b33cea294cc693e177441fc897426ecbc39: - resolution: {tarball: https://codeload.github.com/clash-verge-rev/tauri-plugin-mihomo/tar.gz/d0f00b33cea294cc693e177441fc897426ecbc39} + tauri-plugin-mihomo-api@https://codeload.github.com/clash-verge-rev/tauri-plugin-mihomo/tar.gz/1e2ada19e20c5504a2a8cef367e87c667806dd65: + resolution: {tarball: https://codeload.github.com/clash-verge-rev/tauri-plugin-mihomo/tar.gz/1e2ada19e20c5504a2a8cef367e87c667806dd65} version: 0.1.0 terser@5.44.1: @@ -8629,7 +8629,7 @@ snapshots: minizlib: 3.1.0 yallist: 5.0.0 - tauri-plugin-mihomo-api@https://codeload.github.com/clash-verge-rev/tauri-plugin-mihomo/tar.gz/d0f00b33cea294cc693e177441fc897426ecbc39: + tauri-plugin-mihomo-api@https://codeload.github.com/clash-verge-rev/tauri-plugin-mihomo/tar.gz/1e2ada19e20c5504a2a8cef367e87c667806dd65: dependencies: '@tauri-apps/api': 2.9.0 diff --git a/src-tauri/Cargo.lock b/src-tauri/Cargo.lock index ced4d66ba..bebb20d2a 100644 --- a/src-tauri/Cargo.lock +++ b/src-tauri/Cargo.lock @@ -3289,7 +3289,7 @@ dependencies = [ "httpdate", "itoa", "pin-project-lite", - "socket2 0.5.10", + "socket2 0.4.10", "tokio", "tower-service", "tracing", @@ -3395,7 +3395,7 @@ dependencies = [ "libc", "percent-encoding", "pin-project-lite", - "socket2 0.5.10", + "socket2 0.6.1", "system-configuration", "tokio", "tower-service", @@ -5830,7 +5830,7 @@ dependencies = [ "quinn-udp", "rustc-hash", "rustls", - "socket2 0.5.10", + "socket2 0.6.1", "thiserror 2.0.17", "tokio", "tracing", @@ -5867,7 +5867,7 @@ dependencies = [ "cfg_aliases", "libc", "once_cell", - "socket2 0.5.10", + "socket2 0.6.1", "tracing", "windows-sys 0.60.2", ] @@ -7058,16 +7058,6 @@ dependencies = [ "winapi", ] -[[package]] -name = "socket2" -version = "0.5.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e22376abed350d73dd1cd119b57ffccad95b4e585a7cda43e286245ce23c0678" -dependencies = [ - "libc", - "windows-sys 0.52.0", -] - [[package]] name = "socket2" version = "0.6.1" diff --git a/src/components/connection/connection-detail.tsx b/src/components/connection/connection-detail.tsx index 766f400be..33fd23a8a 100644 --- a/src/components/connection/connection-detail.tsx +++ b/src/components/connection/connection-detail.tsx @@ -3,7 +3,7 @@ import { useLockFn } from "ahooks"; import dayjs from "dayjs"; import { useImperativeHandle, useState, type Ref } from "react"; import { useTranslation } from "react-i18next"; -import { closeConnections } from "tauri-plugin-mihomo-api"; +import { closeConnection } from "tauri-plugin-mihomo-api"; import parseTraffic from "@/utils/parse-traffic"; @@ -123,7 +123,7 @@ const InnerConnectionDetail = ({ data, closed, onClose }: InnerProps) => { }, ]; - const onDelete = useLockFn(async () => closeConnections(data.id)); + const onDelete = useLockFn(async () => closeConnection(data.id)); return ( diff --git a/src/components/connection/connection-item.tsx b/src/components/connection/connection-item.tsx index 7288fc257..6512b5a5a 100644 --- a/src/components/connection/connection-item.tsx +++ b/src/components/connection/connection-item.tsx @@ -10,7 +10,7 @@ import { import { useLockFn } from "ahooks"; import dayjs from "dayjs"; import { useTranslation } from "react-i18next"; -import { closeConnections } from "tauri-plugin-mihomo-api"; +import { closeConnection } from "tauri-plugin-mihomo-api"; import parseTraffic from "@/utils/parse-traffic"; @@ -37,7 +37,7 @@ export const ConnectionItem = (props: Props) => { const { id, metadata, chains, start, curUpload, curDownload } = value; const { t } = useTranslation(); - const onDelete = useLockFn(async () => closeConnections(id)); + const onDelete = useLockFn(async () => closeConnection(id)); const showTraffic = curUpload! >= 100 || curDownload! >= 100; return ( diff --git a/src/hooks/use-proxy-selection.ts b/src/hooks/use-proxy-selection.ts index b6457ce3d..8d2a2df42 100644 --- a/src/hooks/use-proxy-selection.ts +++ b/src/hooks/use-proxy-selection.ts @@ -1,7 +1,7 @@ import { useLockFn } from "ahooks"; import { useCallback, useMemo } from "react"; import { - closeConnections, + closeConnection, getConnections, selectNodeForGroup, } from "tauri-plugin-mihomo-api"; @@ -16,7 +16,7 @@ const cleanupConnections = async (previousProxy: string) => { const { connections } = await getConnections(); const cleanupPromises = (connections ?? []) .filter((conn) => conn.chains.includes(previousProxy)) - .map((conn) => closeConnections(conn.id)); + .map((conn) => closeConnection(conn.id)); if (cleanupPromises.length > 0) { await Promise.allSettled(cleanupPromises);