chore(deps): update node.js to v24.22.0

* fix(backup): keep WebDAV password masked

* fix(eslint): Clean unused imports

Signed-off-by: ❤是纱雾酱哟～ <49941141+Dragon1573@users.noreply.github.com>

---------

Signed-off-by: ❤是纱雾酱哟～ <49941141+Dragon1573@users.noreply.github.com>
Co-authored-by: susu-Sugar <214122492+susu-Sugar@users.noreply.github.com>
Co-authored-by: ❤是纱雾酱哟～ <49941141+Dragon1573@users.noreply.github.com>

.devcontainer/devcontainer.json

@@ -4,7 +4,7 @@
 
   "features": {
     "ghcr.io/devcontainers/features/node:2": {
-      "version": "24.21.0",
+      "version": "24.22.0",
       "pnpmVersion": "12.11.2"
     },
     "ghcr.io/devcontainers/features/rust:1": {

.github/workflows/autobuild.yml

@@ -51,7 +51,7 @@ jobs:
       - name: Install Node
         uses: actions/setup-node@v7
         with:
-          node-version: '24.21.0'
+          node-version: '24.22.0'
 
       - name: Install dependencies
         run: pnpm install --frozen-lockfile
@@ -185,7 +185,7 @@ jobs:
       - name: Install Node
         uses: actions/setup-node@v7
         with:
-          node-version: '24.21.0'
+          node-version: '24.22.0'
           cache: 'pnpm'
 
       - name: Pnpm Cache
@@ -282,7 +282,7 @@ jobs:
       - name: Install Node
         uses: actions/setup-node@v7
         with:
-          node-version: '24.21.0'
+          node-version: '24.22.0'
           cache: 'pnpm'
 
       - name: Pnpm Cache
@@ -426,7 +426,7 @@ jobs:
       - name: Install Node
         uses: actions/setup-node@v7
         with:
-          node-version: '24.21.0'
+          node-version: '24.22.0'
           cache: 'pnpm'
 
       - name: Pnpm Cache
@@ -524,7 +524,7 @@ jobs:
       - name: Install Node
         uses: actions/setup-node@v7
         with:
-          node-version: '24.21.0'
+          node-version: '24.22.0'
 
       - uses: pnpm/action-setup@v6.1.0
         name: Install pnpm

.github/workflows/cross_check.yaml

@@ -43,7 +43,7 @@ jobs:
       - name: Install Node
         uses: actions/setup-node@v7
         with:
-          node-version: '24.21.0'
+          node-version: '24.22.0'
 
       - uses: pnpm/action-setup@v6
         name: Install pnpm

.github/workflows/dev.yml

@@ -103,7 +103,7 @@ jobs:
         if: github.event.inputs[matrix.input] == 'true'
         uses: actions/setup-node@v7
         with:
-          node-version: '24.21.0'
+          node-version: '24.22.0'
           cache: 'pnpm'
 
       - name: Pnpm Cache

.github/workflows/frontend-check.yml

@@ -52,7 +52,7 @@ jobs:
       - uses: actions/setup-node@v7
         if: steps.check_frontend.outputs.frontend == 'true'
         with:
-          node-version: '24.21.0'
+          node-version: '24.22.0'
           cache: 'pnpm'
 
       - name: Restore pnpm cache
@@ -138,7 +138,7 @@ jobs:
       - uses: actions/setup-node@v7
         if: steps.check_inputs.outputs.contract == 'true'
         with:
-          node-version: '24.21.0'
+          node-version: '24.22.0'
           cache: 'pnpm'
 
       - run: pnpm install --frozen-lockfile

.github/workflows/release.yml

@@ -230,7 +230,7 @@ jobs:
       - name: Install Node
         uses: actions/setup-node@v7
         with:
-          node-version: '24.21.0'
+          node-version: '24.22.0'
 
       - uses: pnpm/action-setup@v6
         name: Install pnpm
@@ -331,7 +331,7 @@ jobs:
       - name: Install Node
         uses: actions/setup-node@v7
         with:
-          node-version: '24.21.0'
+          node-version: '24.22.0'
 
       - name: Install pnpm
         uses: pnpm/action-setup@v6
@@ -466,7 +466,7 @@ jobs:
       - name: Install Node
         uses: actions/setup-node@v7
         with:
-          node-version: '24.21.0'
+          node-version: '24.22.0'
 
       - uses: pnpm/action-setup@v6
         name: Install pnpm
@@ -547,7 +547,7 @@ jobs:
       - name: Install Node
         uses: actions/setup-node@v7
         with:
-          node-version: '24.21.0'
+          node-version: '24.22.0'
 
       - uses: pnpm/action-setup@v6
         name: Install pnpm
@@ -573,7 +573,7 @@ jobs:
       - name: Install Node
         uses: actions/setup-node@v7
         with:
-          node-version: '24.21.0'
+          node-version: '24.22.0'
 
       - uses: pnpm/action-setup@v6
         name: Install pnpm
@@ -638,7 +638,7 @@ jobs:
       - name: Install Node
         uses: actions/setup-node@v7
         with:
-          node-version: '24.21.0'
+          node-version: '24.22.0'
 
       - uses: pnpm/action-setup@v6
         name: Install pnpm

.github/workflows/signpath-test.yml

@@ -28,7 +28,7 @@ jobs:
       - name: Install Node
         uses: actions/setup-node@v7
         with:
-          node-version: '24.21.0'
+          node-version: '24.22.0'
 
       - name: Install pnpm
         uses: pnpm/action-setup@v6

.github/workflows/telegram-notify.yml

@@ -34,7 +34,7 @@ jobs:
       - name: Install Node
         uses: actions/setup-node@v7
         with:
-          node-version: '24.21.0'
+          node-version: '24.22.0'
 
       - uses: pnpm/action-setup@v6
         name: Install pnpm

.github/workflows/updater.yml

@@ -15,7 +15,7 @@ jobs:
       - name: Install Node
         uses: actions/setup-node@v7
         with:
-          node-version: '24.21.0'
+          node-version: '24.22.0'
 
       - uses: pnpm/action-setup@v6
         name: Install pnpm
@@ -39,7 +39,7 @@ jobs:
       - name: Install Node
         uses: actions/setup-node@v7
         with:
-          node-version: '24.21.0'
+          node-version: '24.22.0'
 
       - uses: pnpm/action-setup@v6
         name: Install pnpm

.tool-versions

@@ -1,3 +1,3 @@
-nodejs 24.21.0
+nodejs 24.22.0
 pnpm 12.11.2
 rust 1.99.0

Cargo.toml

@@ -49,15 +49,7 @@ split-debuginfo = "unpacked"
 [patch.crates-io]
 # Backport Windows menu command ID recycling on the muda 0.20 compatibility branch.
 muda = { git = "https://github.com/wonfen/muda.git", rev = "547de49352791653fbdfa785f20f3c7ece8468e2" }
-# tauri-specta has no tauri 3 release yet; ride the tauri team's port and the
-# unpublished specta rc.26 line it pins. Drop all six entries once both ship
-# on crates.io.
-tauri-specta = { git = "https://github.com/tauri-apps/tauri-specta", branch = "tauri-v3" }
-specta = { git = "https://github.com/specta-rs/specta.git", rev = "2757fa8899926dce7da999780c7edf2dc08a732a" }
-specta-macros = { git = "https://github.com/specta-rs/specta.git", rev = "2757fa8899926dce7da999780c7edf2dc08a732a" }
-specta-serde = { git = "https://github.com/specta-rs/specta.git", rev = "2757fa8899926dce7da999780c7edf2dc08a732a" }
-specta-typescript = { git = "https://github.com/specta-rs/specta.git", rev = "2757fa8899926dce7da999780c7edf2dc08a732a" }
-specta-util = { git = "https://github.com/specta-rs/specta.git", rev = "2757fa8899926dce7da999780c7edf2dc08a732a" }
+
 [workspace.dependencies]
 clash-verge-draft = { path = "crates/clash-verge-draft" }
 clash-verge-media-unlock = { path = "crates/clash-verge-media-unlock" }
@@ -69,9 +61,8 @@ tracing-estuary = { git = "https://github.com/Tunglies/tracing-estuary.git", bra
 tauri-plugin-clash-verge-sysinfo = { path = "crates/tauri-plugin-clash-verge-sysinfo" }
 tracing = "0.1.44"
 
-tauri = { version = "3.0.0-alpha.4" }
-tauri-runtime-wry = "3.0.0-alpha.4"
-tauri-plugin-clipboard-manager = "3.0.0-alpha.2"
+tauri = { version = "2.12.1" }
+tauri-plugin-clipboard-manager = "2.4.1"
 parking_lot = { version = "0.12.5", features = ["hardware-lock-elision"] }
 anyhow = "1.0.104"
 chrono = "0.4.45"

Changelog.md

@@ -4,6 +4,11 @@
 <summary><strong> 🐞 修复问题 </strong></summary>
 
 - 修复通过 URL 导入订阅时，即使导入的订阅并非当前使用的订阅，也会重新加载当前配置的问题
+- 修复「首页」网站测速失败后卡片一直显示测试中的问题
+
+**🐧 Linux**
+
+- Linux：修复 deb/rpm 安装包错误包含多余的 `frontend-contract` 可执行文件，导致下游重新打包失败的问题
 
 </details>
 

crates/clash-verge-media-unlock/Cargo.toml

@@ -4,7 +4,7 @@ version = "0.1.0"
 edition = "2024"
 
 [dependencies]
-specta = { version = "=2.0.0-rc.26", features = ["derive", "function"] }
+specta = { version = "=2.0.0-rc.25", features = ["derive", "function"] }
 clash-verge-logging = { workspace = true }
 chrono = { workspace = true }
 log = { workspace = true }

crates/clash-verge-signal/src/lib.rs

@@ -1,3 +1,15 @@
+//! Linux-only termination signal bridge.
+//!
+//! Upstream Tauri delivers session-end and termination events to the app on
+//! Windows and macOS, but has no equivalent on Linux: a desktop session may
+//! end without any window or run event reaching the process. Linux builds
+//! keep this crate to listen for SIGTERM, SIGINT and SIGHUP and forward them
+//! to the app quit flow, so system proxy and TUN cleanup still runs before
+//! the process dies. Non-Linux builds compile this crate to nothing and must
+//! not depend on it.
+
+#![cfg(target_os = "linux")]
+
 use std::sync::{
     OnceLock,
     atomic::{AtomicBool, Ordering},
@@ -5,20 +17,13 @@ use std::sync::{
 
 use clash_verge_logging::{Type, logging};
 
-#[cfg(unix)]
 mod unix;
-#[cfg(windows)]
-mod windows;
 
 pub(crate) static RUNTIME: OnceLock<Option<tokio::runtime::Runtime>> = OnceLock::new();
 pub(crate) static SHUTDOWN_LATCH: ShutdownLatch = ShutdownLatch::new();
 
-#[derive(Clone, Copy, Debug, Eq, PartialEq)]
-pub enum ShutdownOutcome {
-    Committed,
-    Canceled,
-}
-
+/// Serializes signal-triggered cleanups: a signal arriving while a quit
+/// attempt is still in flight is dropped instead of overlapping it.
 pub(crate) struct ShutdownLatch {
     is_cleaning_up: AtomicBool,
 }
@@ -36,17 +41,18 @@ impl ShutdownLatch {
             .is_ok()
     }
 
-    fn finish(&self, outcome: ShutdownOutcome) {
-        if matches!(outcome, ShutdownOutcome::Canceled) {
-            self.is_cleaning_up.store(false, Ordering::Release);
-        }
+    fn finish(&self) {
+        self.is_cleaning_up.store(false, Ordering::Release);
     }
 }
 
+/// Spawns the Linux signal loop on a dedicated runtime so it survives the
+/// teardown of any app-owned runtime. The handler runs once per accepted
+/// signal; the quit flow it invokes owns the exit-or-cancel decision.
 pub fn register<F, Fut>(f: F)
 where
     F: Fn() -> Fut + Send + Sync + 'static,
-    Fut: Future<Output = ShutdownOutcome> + Send + 'static,
+    Fut: Future<Output = ()> + Send + 'static,
 {
     RUNTIME.get_or_init(|| match tokio::runtime::Runtime::new() {
         Ok(rt) => Some(rt),
@@ -61,36 +67,22 @@ where
         }
     });
 
-    #[cfg(unix)]
     unix::register(f);
-
-    #[cfg(windows)]
-    windows::register(f);
 }
 
 #[cfg(test)]
 mod tests {
-    use super::{ShutdownLatch, ShutdownOutcome};
+    use super::ShutdownLatch;
 
     #[test]
-    fn canceled_shutdown_releases_latch_and_permits_next_attempt() {
+    fn finished_attempt_releases_latch_for_the_next_signal() {
         let latch = ShutdownLatch::new();
 
         assert!(latch.try_begin());
         assert!(!latch.try_begin());
 
-        latch.finish(ShutdownOutcome::Canceled);
+        latch.finish();
 
         assert!(latch.try_begin());
     }
-
-    #[test]
-    fn committed_shutdown_retains_latch_and_suppresses_repeats() {
-        let latch = ShutdownLatch::new();
-
-        assert!(latch.try_begin());
-        latch.finish(ShutdownOutcome::Committed);
-
-        assert!(!latch.try_begin());
-    }
 }

crates/clash-verge-signal/src/unix.rs

@@ -1,12 +1,12 @@
 use clash_verge_logging::{Type, logging};
 use tokio::signal::unix::{SignalKind, signal};
 
-use crate::{RUNTIME, SHUTDOWN_LATCH, ShutdownOutcome};
+use crate::{RUNTIME, SHUTDOWN_LATCH};
 
 pub fn register<F, Fut>(f: F)
 where
     F: Fn() -> Fut + Send + Sync + 'static,
-    Fut: Future<Output = ShutdownOutcome> + Send + 'static,
+    Fut: Future<Output = ()> + Send + 'static,
 {
     if let Some(Some(rt)) = RUNTIME.get() {
         rt.spawn(async move {
@@ -60,7 +60,8 @@ where
                 }
                 logging!(info, Type::SystemSignal, "Caught signal {}", signal_name);
 
-                SHUTDOWN_LATCH.finish(f().await);
+                f().await;
+                SHUTDOWN_LATCH.finish();
             }
         });
     } else {

crates/clash-verge-signal/src/windows.rs

@@ -1,83 +0,0 @@
-use clash_verge_logging::{Type, logging};
-use tokio::signal::windows;
-
-use crate::{RUNTIME, SHUTDOWN_LATCH, ShutdownOutcome};
-
-pub fn register<F, Fut>(f: F)
-where
-    F: Fn() -> Fut + Send + Sync + 'static,
-    Fut: Future<Output = ShutdownOutcome> + Send + 'static,
-{
-    if let Some(Some(rt)) = RUNTIME.get() {
-        rt.spawn(async move {
-            let mut ctrl_c = match windows::ctrl_c() {
-                Ok(s) => s,
-                Err(e) => {
-                    logging!(error, Type::SystemSignal, "Failed to register Ctrl+C: {}", e);
-                    return;
-                }
-            };
-
-            let mut ctrl_close = match windows::ctrl_close() {
-                Ok(s) => s,
-                Err(e) => {
-                    logging!(error, Type::SystemSignal, "Failed to register Ctrl+Close: {}", e);
-                    return;
-                }
-            };
-
-            let mut ctrl_shutdown = match windows::ctrl_shutdown() {
-                Ok(s) => s,
-                Err(e) => {
-                    logging!(error, Type::SystemSignal, "Failed to register Ctrl+Shutdown: {}", e);
-                    return;
-                }
-            };
-
-            let mut ctrl_logoff = match windows::ctrl_logoff() {
-                Ok(s) => s,
-                Err(e) => {
-                    logging!(error, Type::SystemSignal, "Failed to register Ctrl+Logoff: {}", e);
-                    return;
-                }
-            };
-
-            loop {
-                let signal_name;
-                tokio::select! {
-                    _ = ctrl_c.recv() => {
-                        signal_name = "Ctrl+C";
-                    }
-                    _ = ctrl_close.recv() => {
-                        signal_name = "Ctrl+Close";
-                    }
-                    _ = ctrl_shutdown.recv() => {
-                        signal_name = "Ctrl+Shutdown";
-                    }
-                    _ = ctrl_logoff.recv() => {
-                        signal_name = "Ctrl+Logoff";
-                    }
-                }
-
-                if !SHUTDOWN_LATCH.try_begin() {
-                    logging!(
-                        info,
-                        Type::SystemSignal,
-                        "Already shutting down, ignoring repeated signal: {}",
-                        signal_name
-                    );
-                    continue;
-                }
-                logging!(info, Type::SystemSignal, "Caught Windows signal: {}", signal_name);
-
-                SHUTDOWN_LATCH.finish(f().await);
-            }
-        });
-    } else {
-        logging!(
-            error,
-            Type::SystemSignal,
-            "register shutdown signal failed, RUNTIME is not available"
-        );
-    }
-}

crates/tauri-plugin-clash-verge-sysinfo/Cargo.toml

@@ -5,7 +5,7 @@ edition = "2024"
 rust-version = "1.91"
 
 [dependencies]
-specta = { version = "=2.0.0-rc.26", features = ["derive", "function"] }
+specta = { version = "=2.0.0-rc.25", features = ["derive", "function"] }
 tauri = { workspace = true }
 tauri-plugin-clipboard-manager = { workspace = true }
 parking_lot = { workspace = true }

package.json

@@ -54,13 +54,13 @@
     "@mui/icons-material": "^9.4.0",
     "@mui/material": "^9.4.0",
     "@tanstack/react-virtual": "^3.14.13",
-    "@tauri-apps/api": "3.0.0-alpha.2",
-    "@tauri-apps/plugin-clipboard-manager": "^3.0.0-alpha.2",
-    "@tauri-apps/plugin-dialog": "^3.0.0-alpha.3",
-    "@tauri-apps/plugin-fs": "^3.0.0-alpha.2",
-    "@tauri-apps/plugin-http": "~3.0.0-alpha.2",
-    "@tauri-apps/plugin-opener": "3.0.0-alpha.2",
-    "@tauri-apps/plugin-updater": "3.0.0-alpha.2",
+    "@tauri-apps/api": "2.12.1",
+    "@tauri-apps/plugin-clipboard-manager": "2.4.0",
+    "@tauri-apps/plugin-dialog": "2.8.0",
+    "@tauri-apps/plugin-fs": "2.6.0",
+    "@tauri-apps/plugin-http": "2.8.0",
+    "@tauri-apps/plugin-opener": "2.7.0",
+    "@tauri-apps/plugin-updater": "2.13.1",
     "ahooks": "^3.10.0",
     "cidr-block": "^2.3.0",
     "compare-versions": "^6.1.1",
@@ -95,7 +95,7 @@
     "@biomejs/biome": "^2.5.14",
     "@eslint-react/eslint-plugin": "^5.20.5",
     "@eslint/js": "^10.0.1",
-    "@tauri-apps/cli": "3.0.0-alpha.4",
+    "@tauri-apps/cli": "2.12.1",
     "@types/lodash-es": "^4.17.12",
     "@types/node": "^24.13.6",
     "@types/react": "19.3.0",

pnpm-lock.yaml

@@ -200,26 +200,26 @@ importers:
         specifier: ^3.14.13
         version: 3.14.13(react-dom@19.3.0(react@19.3.0))(react@19.3.0)
       '@tauri-apps/api':
-        specifier: 3.0.0-alpha.2
-        version: 3.0.0-alpha.2
+        specifier: 2.12.1
+        version: 2.12.1
       '@tauri-apps/plugin-clipboard-manager':
-        specifier: ^3.0.0-alpha.2
-        version: 3.0.0-alpha.2
+        specifier: 2.4.0
+        version: 2.4.0
       '@tauri-apps/plugin-dialog':
-        specifier: ^3.0.0-alpha.3
-        version: 3.0.0-alpha.3
+        specifier: 2.8.0
+        version: 2.8.0
       '@tauri-apps/plugin-fs':
-        specifier: ^3.0.0-alpha.2
-        version: 3.0.0-alpha.2
+        specifier: 2.6.0
+        version: 2.6.0
       '@tauri-apps/plugin-http':
-        specifier: ~3.0.0-alpha.2
-        version: 3.0.0-alpha.2
+        specifier: 2.8.0
+        version: 2.8.0
       '@tauri-apps/plugin-opener':
-        specifier: 3.0.0-alpha.2
-        version: 3.0.0-alpha.2
+        specifier: 2.7.0
+        version: 2.7.0
       '@tauri-apps/plugin-updater':
-        specifier: 3.0.0-alpha.2
-        version: 3.0.0-alpha.2
+        specifier: 2.13.1
+        version: 2.13.1
       ahooks:
         specifier: ^3.10.0
         version: 3.10.0(react-dom@19.3.0(react@19.3.0))(react@19.3.0)
@@ -318,8 +318,8 @@ importers:
         specifier: ^10.0.1
         version: 10.0.1(eslint@10.11.0(jiti@2.7.0)(supports-color@7.2.0))
       '@tauri-apps/cli':
-        specifier: 3.0.0-alpha.4
-        version: 3.0.0-alpha.4
+        specifier: 2.12.1
+        version: 2.12.1
       '@types/lodash-es':
         specifier: ^4.17.12
         version: 4.17.12
@@ -2129,102 +2129,99 @@ packages:
   '@tauri-apps/api@2.12.1':
     resolution: {integrity: sha512-DeyFHa3wynpyoqTDikDEDGTJIq4LQ5USfolQGRmGIWT6JMADyxZBTDa5cAdT3tDg73rUXufPaCwN7aXBos4OnQ==}
 
-  '@tauri-apps/api@3.0.0-alpha.2':
-    resolution: {integrity: sha512-W5MTTRAsbNqxSO5hf6U6gHwtTfW0ZnEyIWkmn9L6XYWFcSi0n1JtVQAIsJ6EZHLpJkchGEFwSeVBy+IcrtXl4g==}
-
-  '@tauri-apps/cli-darwin-arm64@3.0.0-alpha.4':
-    resolution: {integrity: sha512-QSySr8o6f8nD/6e8BG9QYQTExlAhsiM2c6ewNti3kzcVzDh7WvM/Jya93mKhQrSjKumq7bUa/jlgmFB24P2oNA==}
+  '@tauri-apps/cli-darwin-arm64@2.12.1':
+    resolution: {integrity: sha512-8bMnbpJ2jKO/ufrOPL65EMHC3ptw7fzeraoQkwibyfGLqIl+UCWsC0152kmNbW6r9NvVQduXqAZF5mH1QgTWhw==}
     engines: {node: '>= 10'}
     cpu: [arm64]
     os: [darwin]
 
-  '@tauri-apps/cli-darwin-x64@3.0.0-alpha.4':
-    resolution: {integrity: sha512-sx0fxH4CEWdWeB8THKzB4mF8P0ZXi1UXO/gVM4dzLjFpHcZbvMJ7B2cBeHNH3ED16aVKbbCGVYLDFVLh56x1Kg==}
+  '@tauri-apps/cli-darwin-x64@2.12.1':
+    resolution: {integrity: sha512-G+2qte8GNqNlEZ9ftd21rbu/APVkl3r/nzNDI7LVxEoqJWVNe9GbEgQUMH1r4PHT20Z2UxR3KjCkltIb0e/Wjg==}
     engines: {node: '>= 10'}
     cpu: [x64]
     os: [darwin]
 
-  '@tauri-apps/cli-linux-arm-gnueabihf@3.0.0-alpha.4':
-    resolution: {integrity: sha512-eyABwsj3vJiyipJERTJCMYJfguXCxiL94Ux8SP9rwBao7cOEFgonhX2uG57/K4RekmZPFMekcfHp8JMXf88VCQ==}
+  '@tauri-apps/cli-linux-arm-gnueabihf@2.12.1':
+    resolution: {integrity: sha512-5b3n4DaTW+A1Zntnh4Yn44VyLrlPEpB8kMOBRfWkzNnzolBk+AYhKIfKjCLmoC8Mob3ETodxAEOMkE2YPKEWzQ==}
     engines: {node: '>= 10'}
     cpu: [arm]
     os: [linux]
 
-  '@tauri-apps/cli-linux-arm64-gnu@3.0.0-alpha.4':
-    resolution: {integrity: sha512-HmYCfjTlpn3mwMh5A2PeZud6QBZJbstTQDRCbs6ikd8t9GurSGTJINVbONrauNKUXYd37c8h5eEERRrkzqpK+w==}
+  '@tauri-apps/cli-linux-arm64-gnu@2.12.1':
+    resolution: {integrity: sha512-APArHhDu+8pXSCkCQmvaz1nD3d8WTmlCoSS/oG475TJ6AATBvyQOAmf5qELgsQ4s2+8MOsop0Zd699RKELF1Cw==}
     engines: {node: '>= 10'}
     cpu: [arm64]
     os: [linux]
     libc: [glibc]
 
-  '@tauri-apps/cli-linux-arm64-musl@3.0.0-alpha.4':
-    resolution: {integrity: sha512-BgD2YHYkOLKJ8qIpiwnYmq1xMKhxwGEOeX+HRjyrtIb4Eonf4/qGKfH7AoN88MUjpUfm+Zn3AZ82bQBAFDhV9Q==}
+  '@tauri-apps/cli-linux-arm64-musl@2.12.1':
+    resolution: {integrity: sha512-JaCxcLoV0oGtllVkLr4UAHWG/wTfkEunnUqnsEsGYOp0VRxnUwHg63wFBD0jU2ul5eFfSLIDS4RF2gfzsSo5Jg==}
     engines: {node: '>= 10'}
     cpu: [arm64]
     os: [linux]
     libc: [musl]
 
-  '@tauri-apps/cli-linux-riscv64-gnu@3.0.0-alpha.4':
-    resolution: {integrity: sha512-AHl6DFQEtNDaI2YuIqNeSm7G3RWlHSz2R23+j1woFMXZjR48Dd7xSxthWybnxgy09Qw//8OeE5LX0u9oaC07ew==}
+  '@tauri-apps/cli-linux-riscv64-gnu@2.12.1':
+    resolution: {integrity: sha512-K5+VXM7+SGVDwZleA2+lMgvbTVuA5e1tkiVEawu1Yxj26ZyEfO8h8xTC1rBdRX2xgJDSwCk6vPUBCS6i+Z5slQ==}
     engines: {node: '>= 10'}
     cpu: [riscv64]
     os: [linux]
     libc: [glibc]
 
-  '@tauri-apps/cli-linux-x64-gnu@3.0.0-alpha.4':
-    resolution: {integrity: sha512-sfLIf/Dr3fio2gGAIXvjDdhESeQDyVKTTuhXfKV361gcTcx+/OkkctVw1FBKgdtRqDP0JVQI9y8sXdhuL0F61A==}
+  '@tauri-apps/cli-linux-x64-gnu@2.12.1':
+    resolution: {integrity: sha512-Z1QGPr49HJZMktu+Spu6Q1b/f9ANadXvqZZZt2645ua1x1ev6prOgp85eiGv2jRzohFEMLo6aJyaLjLUX5KIvA==}
     engines: {node: '>= 10'}
     cpu: [x64]
     os: [linux]
     libc: [glibc]
 
-  '@tauri-apps/cli-linux-x64-musl@3.0.0-alpha.4':
-    resolution: {integrity: sha512-3aY8+4mvts+dia8VXfGhJYxhhU57fdcbL7IxKLrTt4ASrsXwCDspVf+yVfa0GKpsUWPIxsGA7dYt9oaviv8gkg==}
+  '@tauri-apps/cli-linux-x64-musl@2.12.1':
+    resolution: {integrity: sha512-nHuEhRPOMSJ/8RRhtMRxB9B9lVr7xxpe4DapBz8x1GIau3vdzjHHJ1hAfmw+PyayPLZ6XoaVIHPgI17rX6ii8w==}
     engines: {node: '>= 10'}
     cpu: [x64]
     os: [linux]
     libc: [musl]
 
-  '@tauri-apps/cli-win32-arm64-msvc@3.0.0-alpha.4':
-    resolution: {integrity: sha512-m3hVaoWavJBGHrKPGjhyCVW+IIbXMTP2CvqqG7Ak6yoVJLEYYTwkwfEq/dMHpX9Spw9iQE5pONK1vTatcJ/jPQ==}
+  '@tauri-apps/cli-win32-arm64-msvc@2.12.1':
+    resolution: {integrity: sha512-I0oPk2uGh86R8dAs2X5OxSP+/GqSc8jh1Px3l8EqrocSNivsRHDTh2k3PVOqdv163dlV6PIVvmhZAbH/lPfZrA==}
     engines: {node: '>= 10'}
     cpu: [arm64]
     os: [win32]
 
-  '@tauri-apps/cli-win32-ia32-msvc@3.0.0-alpha.4':
-    resolution: {integrity: sha512-v8J3IgwgFsOiuDPLCScYGAQjQZKj+46o1mMRVcx4gYo1JV9P6o/hblJX5nMT/oTTGdsAgao5PZNxUlX8WJGMFA==}
+  '@tauri-apps/cli-win32-ia32-msvc@2.12.1':
+    resolution: {integrity: sha512-baNZRBfepAJ5qNFRMwzgBk94xQmkcmTZrNDjZjnzrq2vAaTC3NAhallb/zo3hyoCGQlMS13sdovktrg46NZz6Q==}
     engines: {node: '>= 10'}
     cpu: [ia32]
     os: [win32]
 
-  '@tauri-apps/cli-win32-x64-msvc@3.0.0-alpha.4':
-    resolution: {integrity: sha512-BfEHaKBdNImxb9KOVji9hROEVnPWl2ImshQmV9ASC61jraX2/xCJ+YNdaAi7yA18qAyQVb/CszsfhFWJHT+YbA==}
+  '@tauri-apps/cli-win32-x64-msvc@2.12.1':
+    resolution: {integrity: sha512-dIFaKslrzcbesb+bBh+E1R9km241pHyj32w6D9FPtvQeYpRUFbiCLEa/2S+S0UnIytfxepp4P+X8IerGqnXeYg==}
     engines: {node: '>= 10'}
     cpu: [x64]
     os: [win32]
 
-  '@tauri-apps/cli@3.0.0-alpha.4':
-    resolution: {integrity: sha512-hu2CcWxH6yeo5CfLkEYvDOHW5aKdh0gY5DobR5UK+psBInfsc/qKetD0HA+Z41WvVQZsHJXk2uvPMUZP2ckAJg==}
+  '@tauri-apps/cli@2.12.1':
+    resolution: {integrity: sha512-kEDEiGzG+yAc5FeLxtXpES/VN+F2C8H0r4gDVtfRLKxT9np9101d9REG/Kgo2lr0hKi0IpDsODiHnU3+naOmLg==}
     engines: {node: '>= 10'}
     hasBin: true
 
-  '@tauri-apps/plugin-clipboard-manager@3.0.0-alpha.2':
-    resolution: {integrity: sha512-87oq7PUtHZk0PZgvIp5KWsXWOIJtUz3qEiL+PFvV/dC4T4EByi+dx4/hZ+/BMiX7lchknPmA6WTmmx+530Xjgw==}
+  '@tauri-apps/plugin-clipboard-manager@2.4.0':
+    resolution: {integrity: sha512-yAuTffXc/sm+4oYnrwxbUkaJXQMTesPJ9dim0ADcA31rpboyhAN2TGQqs9VCcPIpb60LFOeePkvhpP2I3xhejg==}
 
-  '@tauri-apps/plugin-dialog@3.0.0-alpha.3':
-    resolution: {integrity: sha512-LjP/CwCaQ/uVhIjFbMG1JM9MY9+gvNchoRsQoOQpm1+y8dWKCb4/VFFXv+RuH6XbR11eIU6G+yL34hggc7iw2Q==}
+  '@tauri-apps/plugin-dialog@2.8.0':
+    resolution: {integrity: sha512-HSSD5C8UFE9ijD1wue84F7jjaIReFmj8AAPtS+xyjYRltJafIc4BiWHY7SJ6vbbew6u+YljEJHfyNfy5VwywXg==}
 
-  '@tauri-apps/plugin-fs@3.0.0-alpha.2':
-    resolution: {integrity: sha512-w/pmQ5swWqEgQhWMabreK5eMIiAHXHFKdb/SWGrZF4tTpVky/dUAyScFl7XiFRKpfr5cHSDiZAP/dsg0Ud9p9w==}
+  '@tauri-apps/plugin-fs@2.6.0':
+    resolution: {integrity: sha512-MhBAZ4rryd+h9fijd/GWDfArqiAeGI0ZNduV4wuRyUVI6wDZ+oDBY7atqtoXKDwlTUVSvpvmWJAY0ehQd/v6Uw==}
 
-  '@tauri-apps/plugin-http@3.0.0-alpha.2':
-    resolution: {integrity: sha512-imgCIw601u03ahDFu+ifiOKMAU6zab0taYp6h6Z7O9TcsU1SRqgXxbVcO84iLQ4bjELiFdAtUp0xqiNx+r8fvg==}
+  '@tauri-apps/plugin-http@2.8.0':
+    resolution: {integrity: sha512-cPvZvfUSaBkqGxef/dgbh/iEl6T3jQfSJyypi9OdcWr1VcuTt4ZRlk9DLAHEHF2q2NML+0UOkjyXRPNo6Cky6g==}
 
-  '@tauri-apps/plugin-opener@3.0.0-alpha.2':
-    resolution: {integrity: sha512-T3Y7Y/m+XybZqB2cI6SZD8St47GBONPTbFp+hSYFLHy5Lh0eNh0sv9TRyi7MElzUtUx0NWZltAOHuHzeo2UfWA==}
+  '@tauri-apps/plugin-opener@2.7.0':
+    resolution: {integrity: sha512-mBorYfVKh9Lt7s4ZFtKbMUTxBw+Y/sVmSlKCtkkoBgMTC/DIbt/kaPm67L/2djAUqDI1wbixy5OHHVmipjuGMw==}
 
-  '@tauri-apps/plugin-updater@3.0.0-alpha.2':
-    resolution: {integrity: sha512-WHRIi50gV9M2JDx9VZLxlpcuA3gvd7eABaqfNQEQTdKUSuIWyS/gQcbH5LpiuSWSkCTMMInUUBmost2LdZnnkA==}
+  '@tauri-apps/plugin-updater@2.13.1':
+    resolution: {integrity: sha512-+STDzJ0sdQLImjc63zkv6Nncimqeo6jyCWoTQtbSwgGLNj1qbP9I6LC4p5R5ocBk3gNKAZs6i/AJz0jxysytiw==}
 
   '@tybys/wasm-util@0.10.4':
     resolution: {integrity: sha512-W3c4gRigFS0T/Ma4qIYF3GDAc5AQdHb1yL5znJT1Zv1YaD9Kitx656wBjvr19qbiosmZT8lWDM5BEMynUqX65A==}
@@ -6910,78 +6907,76 @@ snapshots:
 
   '@tauri-apps/api@2.12.1': {}
 
-  '@tauri-apps/api@3.0.0-alpha.2': {}
-
-  '@tauri-apps/cli-darwin-arm64@3.0.0-alpha.4':
+  '@tauri-apps/cli-darwin-arm64@2.12.1':
     optional: true
 
-  '@tauri-apps/cli-darwin-x64@3.0.0-alpha.4':
+  '@tauri-apps/cli-darwin-x64@2.12.1':
     optional: true
 
-  '@tauri-apps/cli-linux-arm-gnueabihf@3.0.0-alpha.4':
+  '@tauri-apps/cli-linux-arm-gnueabihf@2.12.1':
     optional: true
 
-  '@tauri-apps/cli-linux-arm64-gnu@3.0.0-alpha.4':
+  '@tauri-apps/cli-linux-arm64-gnu@2.12.1':
     optional: true
 
-  '@tauri-apps/cli-linux-arm64-musl@3.0.0-alpha.4':
+  '@tauri-apps/cli-linux-arm64-musl@2.12.1':
     optional: true
 
-  '@tauri-apps/cli-linux-riscv64-gnu@3.0.0-alpha.4':
+  '@tauri-apps/cli-linux-riscv64-gnu@2.12.1':
     optional: true
 
-  '@tauri-apps/cli-linux-x64-gnu@3.0.0-alpha.4':
+  '@tauri-apps/cli-linux-x64-gnu@2.12.1':
     optional: true
 
-  '@tauri-apps/cli-linux-x64-musl@3.0.0-alpha.4':
+  '@tauri-apps/cli-linux-x64-musl@2.12.1':
     optional: true
 
-  '@tauri-apps/cli-win32-arm64-msvc@3.0.0-alpha.4':
+  '@tauri-apps/cli-win32-arm64-msvc@2.12.1':
     optional: true
 
-  '@tauri-apps/cli-win32-ia32-msvc@3.0.0-alpha.4':
+  '@tauri-apps/cli-win32-ia32-msvc@2.12.1':
     optional: true
 
-  '@tauri-apps/cli-win32-x64-msvc@3.0.0-alpha.4':
+  '@tauri-apps/cli-win32-x64-msvc@2.12.1':
     optional: true
 
-  '@tauri-apps/cli@3.0.0-alpha.4':
+  '@tauri-apps/cli@2.12.1':
     optionalDependencies:
-      '@tauri-apps/cli-darwin-arm64': 3.0.0-alpha.4
-      '@tauri-apps/cli-darwin-x64': 3.0.0-alpha.4
-      '@tauri-apps/cli-linux-arm-gnueabihf': 3.0.0-alpha.4
-      '@tauri-apps/cli-linux-arm64-gnu': 3.0.0-alpha.4
-      '@tauri-apps/cli-linux-arm64-musl': 3.0.0-alpha.4
-      '@tauri-apps/cli-linux-riscv64-gnu': 3.0.0-alpha.4
-      '@tauri-apps/cli-linux-x64-gnu': 3.0.0-alpha.4
-      '@tauri-apps/cli-linux-x64-musl': 3.0.0-alpha.4
-      '@tauri-apps/cli-win32-arm64-msvc': 3.0.0-alpha.4
-      '@tauri-apps/cli-win32-ia32-msvc': 3.0.0-alpha.4
-      '@tauri-apps/cli-win32-x64-msvc': 3.0.0-alpha.4
+      '@tauri-apps/cli-darwin-arm64': 2.12.1
+      '@tauri-apps/cli-darwin-x64': 2.12.1
+      '@tauri-apps/cli-linux-arm-gnueabihf': 2.12.1
+      '@tauri-apps/cli-linux-arm64-gnu': 2.12.1
+      '@tauri-apps/cli-linux-arm64-musl': 2.12.1
+      '@tauri-apps/cli-linux-riscv64-gnu': 2.12.1
+      '@tauri-apps/cli-linux-x64-gnu': 2.12.1
+      '@tauri-apps/cli-linux-x64-musl': 2.12.1
+      '@tauri-apps/cli-win32-arm64-msvc': 2.12.1
+      '@tauri-apps/cli-win32-ia32-msvc': 2.12.1
+      '@tauri-apps/cli-win32-x64-msvc': 2.12.1
 
-  '@tauri-apps/plugin-clipboard-manager@3.0.0-alpha.2':
+  '@tauri-apps/plugin-clipboard-manager@2.4.0':
     dependencies:
-      '@tauri-apps/api': 3.0.0-alpha.2
+      '@tauri-apps/api': 2.12.1
 
-  '@tauri-apps/plugin-dialog@3.0.0-alpha.3':
+  '@tauri-apps/plugin-dialog@2.8.0':
     dependencies:
-      '@tauri-apps/api': 3.0.0-alpha.2
+      '@tauri-apps/api': 2.12.1
 
-  '@tauri-apps/plugin-fs@3.0.0-alpha.2':
+  '@tauri-apps/plugin-fs@2.6.0':
     dependencies:
-      '@tauri-apps/api': 3.0.0-alpha.2
+      '@tauri-apps/api': 2.12.1
 
-  '@tauri-apps/plugin-http@3.0.0-alpha.2':
+  '@tauri-apps/plugin-http@2.8.0':
     dependencies:
-      '@tauri-apps/api': 3.0.0-alpha.2
+      '@tauri-apps/api': 2.12.1
 
-  '@tauri-apps/plugin-opener@3.0.0-alpha.2':
+  '@tauri-apps/plugin-opener@2.7.0':
     dependencies:
-      '@tauri-apps/api': 3.0.0-alpha.2
+      '@tauri-apps/api': 2.12.1
 
-  '@tauri-apps/plugin-updater@3.0.0-alpha.2':
+  '@tauri-apps/plugin-updater@2.13.1':
     dependencies:
-      '@tauri-apps/api': 3.0.0-alpha.2
+      '@tauri-apps/api': 2.12.1
 
   '@tybys/wasm-util@0.10.4':
     dependencies:

pnpm-workspace.yaml

@@ -10,15 +10,3 @@ allowBuilds:
   unrs-resolver: true
 minimumReleaseAgeExclude:
   - dayjs@1.11.21
-  - '@tauri-apps/cli-darwin-arm64@3.0.0-alpha.4'
-  - '@tauri-apps/cli-darwin-x64@3.0.0-alpha.4'
-  - '@tauri-apps/cli-linux-arm-gnueabihf@3.0.0-alpha.4'
-  - '@tauri-apps/cli-linux-arm64-gnu@3.0.0-alpha.4'
-  - '@tauri-apps/cli-linux-arm64-musl@3.0.0-alpha.4'
-  - '@tauri-apps/cli-linux-riscv64-gnu@3.0.0-alpha.4'
-  - '@tauri-apps/cli-linux-x64-gnu@3.0.0-alpha.4'
-  - '@tauri-apps/cli-linux-x64-musl@3.0.0-alpha.4'
-  - '@tauri-apps/cli-win32-arm64-msvc@3.0.0-alpha.4'
-  - '@tauri-apps/cli-win32-ia32-msvc@3.0.0-alpha.4'
-  - '@tauri-apps/cli-win32-x64-msvc@3.0.0-alpha.4'
-  - '@tauri-apps/cli@3.0.0-alpha.4'

scripts/gen-contract.mjs

@@ -22,7 +22,7 @@ try {
       'run',
       '-p',
       'clash-verge',
-      '--bin',
+      '--example',
       'frontend-contract',
       '--locked',
       '-q',

src-tauri/Cargo.toml

@@ -23,33 +23,30 @@ tauri-dev = ["dep:tauri-plugin-devtools"]
 tokio-trace = ["clash-verge-logging/tokio-trace"]
 chrome-trace = ["clash-verge-logging/chrome-trace"]
 clippy = ["tauri/test"]
-# The perf-harness feature and its main.rs wiring are parked until
-# tauri-plugin-wdio-webdriver publishes a tauri 3 release; restore both
-# from git history together with the crate dependency.
+perf-harness = ["dep:tauri-plugin-wdio-webdriver"]
 
 [package.metadata.bundle]
 identifier = "io.github.clash-verge-rev.clash-verge-rev"
 
 [build-dependencies]
-tauri-build = { version = "3.0.0-alpha.3", features = [] }
+tauri-build = { version = "2.7.1", features = [] }
 
 [dependencies]
 clash-verge-draft = { workspace = true }
 clash-verge-media-unlock = { workspace = true }
 clash-verge-logging = { workspace = true }
-clash-verge-signal = { workspace = true }
 clash-verge-i18n = { workspace = true }
 clash-verge-limiter = { workspace = true }
 tauri-plugin-clash-verge-sysinfo = { workspace = true }
 tauri-plugin-clipboard-manager = { workspace = true }
 tauri = { workspace = true, features = [
   "protocol-asset",
+  "devtools",
   "tracing",
   "tray-icon",
   "image-ico",
   "image-png",
 ] }
-tauri-runtime-wry = { workspace = true, features = ["devtools"] }
 parking_lot = { workspace = true }
 anyhow = { workspace = true }
 tokio = { workspace = true }
@@ -75,13 +72,13 @@ sysproxy = { git = "https://github.com/clash-verge-rev/sysproxy-rs.git", branch
   "guard",
 ] }
 network-interface = { version = "2.0.5", features = ["serde"] }
-tauri-plugin-shell = "3.0.0-alpha.2"
-tauri-plugin-opener = "3.0.0-alpha.2"
-tauri-plugin-dialog = "3.0.0-alpha.3"
-tauri-plugin-fs = "3.0.0-alpha.2"
-tauri-plugin-process = "3.0.0-alpha.2"
-tauri-plugin-deep-link = "3.0.0-alpha.2"
-tauri-plugin-window-state = "3.0.0-alpha.2"
+tauri-plugin-shell = "2.4.0"
+tauri-plugin-opener = "2.7.0"
+tauri-plugin-dialog = "2.8.1"
+tauri-plugin-fs = "2.6.0"
+tauri-plugin-process = "2.4.0"
+tauri-plugin-deep-link = "2.6.1"
+tauri-plugin-window-state = "2.5.0"
 zip = "9.0.1"
 flate2 = "1.1.10"
 reqwest_dav = "0.3.3"
@@ -93,13 +90,13 @@ getrandom = "0.4.3"
 futures = "0.3.34"
 gethostname = "1.1.0"
 scopeguard = "1.2.0"
-tauri-plugin-notification = "3.0.0-alpha.2"
+tauri-plugin-notification = "2.5.1"
 tokio-stream = "0.1.19"
 backon = { version = "1.6.0", features = ["tokio-sleep"] }
-tauri-plugin-http = "3.0.0-alpha.2"
+tauri-plugin-http = "2.8.0"
 tracing = { workspace = true }
-tauri-plugin-devtools = { version = "3.0.0-alpha.0", optional = true }
-tauri-plugin-mihomo = { git = "https://github.com/clash-verge-rev/tauri-plugin-mihomo", branch = "feat/tauri-v3" }
+tauri-plugin-devtools = { version = "2.2.2", optional = true }
+tauri-plugin-mihomo = { git = "https://github.com/clash-verge-rev/tauri-plugin-mihomo", branch = "main" }
 async-trait = "0.1.92"
 clash_verge_service_ipc = { git = "https://github.com/clash-verge-rev/clash-verge-service-ipc.git", tag = "v2.7.6", version = "2.7.6", features = [
   "client",
@@ -111,14 +108,19 @@ webpki-roots = "1.0.9"
 dark-light = "3.0.0"
 bytes = "1.12.1"
 tokio-util = { version = "0.7.19", features = ["time"] }
-specta = { version = "=2.0.0-rc.26", features = ["derive", "function", "serde_json"] }
+specta = { version = "=2.0.0-rc.25", features = ["derive", "function", "serde_json"] }
 tauri-specta = { version = "=2.0.0-rc.25", features = ["derive", "typescript"] }
-specta-typescript = "=0.0.13"
+specta-typescript = "=0.0.12"
 
 [target.'cfg(unix)'.dependencies]
 libc = "0.2.190"
 
+[target.'cfg(target_os = "linux")'.dependencies]
+# Upstream has no session-end signal support on Linux; see crates/clash-verge-signal.
+clash-verge-signal = { workspace = true }
+
 [target.'cfg(target_os = "macos")'.dependencies]
+tauri-plugin-wdio-webdriver = { version = "=1.4.0", optional = true }
 objc2 = "0.6.5"
 objc2-foundation = { version = "0.3.2", features = [
   "NSString",
@@ -150,9 +152,9 @@ windows = { version = "0.62.2", features = ["Win32_Globalization"] }
 windows-sys.workspace = true
 
 [target.'cfg(not(any(target_os = "android", target_os = "ios")))'.dependencies]
-tauri-plugin-autostart = "3.0.0-alpha.2"
-tauri-plugin-global-shortcut = "3.0.0-alpha.2"
-tauri-plugin-updater = "3.0.0-alpha.2"
+tauri-plugin-autostart = "2.7.0"
+tauri-plugin-global-shortcut = "2.4.0"
+tauri-plugin-updater = "2.13.1"
 
 [dev-dependencies]
 criterion = { workspace = true }

src-tauri/capabilities/migrated.json

@@ -70,6 +70,7 @@
     "dialog:allow-open",
     "global-shortcut:allow-is-registered",
     "global-shortcut:allow-register",
+    "global-shortcut:allow-register-all",
     "global-shortcut:allow-unregister",
     "global-shortcut:allow-unregister-all",
     "process:allow-exit",

src-tauri/examples/frontend-contract.rs

@@ -1,3 +1,5 @@
+// Dev-only target: Tauri ships everything under src/bin/ to /usr/bin in deb/rpm
+// bundles (PR #8131), so this generator must stay an example, never a bin.
 fn main() -> Result<(), Box<dyn std::error::Error>> {
     let mut args = std::env::args_os().skip(1);
     let output = args

src-tauri/src/core/autostart.rs

@@ -24,7 +24,7 @@ pub async fn update_launch() -> Result<()> {
     #[cfg(not(target_os = "windows"))]
     {
         let app_handle = Handle::app_handle();
-        let autostart_manager = app_handle.autostart();
+        let autostart_manager = app_handle.autolaunch();
         if is_enable {
             logging_error!(Type::System, "{:?}", autostart_manager.enable());
         } else {

src-tauri/src/core/tray/mod.rs

@@ -23,9 +23,8 @@ use smartstring::alias::String;
 use std::borrow::Cow;
 use std::collections::HashMap;
 use std::time::Duration;
-use tauri::Manager as _;
 use tauri::{
-    AppHandle, DynRuntime,
+    AppHandle, Wry,
     menu::{CheckMenuItem, IsMenuItem, MenuEvent, MenuItem, PredefinedMenuItem, Submenu},
 };
 
@@ -37,7 +36,7 @@ use menu_def::{MenuIds, MenuTexts};
 
 // TODO: 是否需要将可变菜单抽离存储起来，后续直接更新对应菜单实例，无需重新创建菜单(待考虑)
 
-type ProxyMenuItem = (Option<Submenu<DynRuntime>>, Vec<Box<dyn IsMenuItem<DynRuntime>>>);
+type ProxyMenuItem = (Option<Submenu<Wry>>, Vec<Box<dyn IsMenuItem<Wry>>>);
 
 const TRAY_CLICK_DEBOUNCE_MS: u64 = 300;
 pub const TRAY_ID: &str = "clash-verge-rev-tray";
@@ -58,14 +57,14 @@ enum IconKind {
 }
 
 struct LatencyMenuItem {
-    item: MenuItem<DynRuntime>,
+    item: MenuItem<Wry>,
     running: bool,
     proxies: Vec<ProxyLatencyItem>,
     provider_state: ProxyViewProviderState,
 }
 
 struct ProxyLatencyItem {
-    item: CheckMenuItem<DynRuntime>,
+    item: CheckMenuItem<Wry>,
     name: std::string::String,
     provider_name: Option<std::string::String>,
     text: std::string::String,
@@ -567,7 +566,7 @@ fn create_hotkeys(hotkeys: &Option<Vec<String>>) -> HashMap<&str, &str> {
 fn create_profile_menu_item(
     app_handle: &AppHandle,
     profiles_preview: Vec<IProfilePreview<'_>>,
-) -> Result<Vec<CheckMenuItem<DynRuntime>>> {
+) -> Result<Vec<CheckMenuItem<Wry>>> {
     profiles_preview
         .into_iter()
         .map(|profile| {
@@ -678,7 +677,7 @@ fn create_subcreate_proxy_menu_item(
     texts: &MenuTexts,
     verge: &IVerge,
     profiles: &crate::config::IProfiles,
-) -> Vec<Submenu<DynRuntime>> {
+) -> Vec<Submenu<Wry>> {
     let Some(view) = view else { return Vec::new() };
     view.groups
         .iter()
@@ -740,8 +739,8 @@ fn create_subcreate_proxy_menu_item(
                 },
             );
             let separator = PredefinedMenuItem::separator(app_handle).ok()?;
-            let mut items: Vec<&dyn IsMenuItem<DynRuntime>> = vec![&test_item, &separator];
-            items.extend(group_items.iter().map(|item| item as &dyn IsMenuItem<DynRuntime>));
+            let mut items: Vec<&dyn IsMenuItem<Wry>> = vec![&test_item, &separator];
+            items.extend(group_items.iter().map(|item| item as &dyn IsMenuItem<Wry>));
             Submenu::with_id_and_items(
                 app_handle,
                 format!("proxy_group_{}", group.name),
@@ -758,7 +757,7 @@ fn create_subcreate_proxy_menu_item(
 fn create_proxy_menu_item(
     app_handle: &AppHandle,
     show_proxy_groups_inline: bool,
-    proxy_submenus: Vec<Submenu<DynRuntime>>,
+    proxy_submenus: Vec<Submenu<Wry>>,
     proxies_text: &str,
 ) -> Result<ProxyMenuItem> {
     let (proxies_submenu, inline_proxy_items) = if show_proxy_groups_inline {
@@ -766,13 +765,13 @@ fn create_proxy_menu_item(
             None,
             proxy_submenus
                 .into_iter()
-                .map(|submenu| Box::new(submenu) as Box<dyn IsMenuItem<DynRuntime>>)
+                .map(|submenu| Box::new(submenu) as Box<dyn IsMenuItem<Wry>>)
                 .collect(),
         )
     } else if !proxy_submenus.is_empty() {
-        let proxy_submenu_refs: Vec<&dyn IsMenuItem<DynRuntime>> = proxy_submenus
+        let proxy_submenu_refs: Vec<&dyn IsMenuItem<Wry>> = proxy_submenus
             .iter()
-            .map(|submenu| submenu as &dyn IsMenuItem<DynRuntime>)
+            .map(|submenu| submenu as &dyn IsMenuItem<Wry>)
             .collect();
 
         (
@@ -799,10 +798,7 @@ async fn create_tray_menu(
     tun_mode_available: bool,
     profiles_preview: Vec<IProfilePreview<'_>>,
     options: TrayMenuOptions,
-) -> Result<(
-    tauri::menu::Menu<DynRuntime>,
-    HashMap<std::string::String, LatencyMenuItem>,
-)> {
+) -> Result<(tauri::menu::Menu<Wry>, HashMap<std::string::String, LatencyMenuItem>)> {
     let current_proxy_mode = mode.unwrap_or("");
 
     let mut verge_settings = Config::verge().await.latest_arc();
@@ -840,12 +836,12 @@ async fn create_tray_menu(
 
     let hotkeys = create_hotkeys(&verge_settings.hotkeys);
 
-    let profile_menu_items: Vec<CheckMenuItem<DynRuntime>> = create_profile_menu_item(app_handle, profiles_preview)?;
+    let profile_menu_items: Vec<CheckMenuItem<Wry>> = create_profile_menu_item(app_handle, profiles_preview)?;
 
     let texts = MenuTexts::new();
-    let profile_menu_items_refs: Vec<&dyn IsMenuItem<DynRuntime>> = profile_menu_items
+    let profile_menu_items_refs: Vec<&dyn IsMenuItem<Wry>> = profile_menu_items
         .iter()
-        .map(|item| item as &dyn IsMenuItem<DynRuntime>)
+        .map(|item| item as &dyn IsMenuItem<Wry>)
         .collect();
 
     let open_window = &MenuItem::with_id(
@@ -898,9 +894,9 @@ async fn create_tray_menu(
             outbound_modes_label.as_str(),
             true,
             &[
-                rule_mode as &dyn IsMenuItem<DynRuntime>,
-                global_mode as &dyn IsMenuItem<DynRuntime>,
-                direct_mode as &dyn IsMenuItem<DynRuntime>,
+                rule_mode as &dyn IsMenuItem<Wry>,
+                global_mode as &dyn IsMenuItem<Wry>,
+                direct_mode as &dyn IsMenuItem<Wry>,
             ],
         )?)
     };
@@ -1013,7 +1009,7 @@ async fn create_tray_menu(
         &texts.more,
         true,
         &[
-            copy_env as &dyn IsMenuItem<DynRuntime>,
+            copy_env as &dyn IsMenuItem<Wry>,
             close_all_connections,
             restart_clash,
             restart_app,
@@ -1030,13 +1026,13 @@ async fn create_tray_menu(
 
     let separator = &PredefinedMenuItem::separator(app_handle)?;
 
-    let mut menu_items: Vec<&dyn IsMenuItem<DynRuntime>> = vec![open_window, separator];
+    let mut menu_items: Vec<&dyn IsMenuItem<Wry>> = vec![open_window, separator];
 
     if show_outbound_modes_inline {
         menu_items.extend_from_slice(&[
-            rule_mode as &dyn IsMenuItem<DynRuntime>,
-            global_mode as &dyn IsMenuItem<DynRuntime>,
-            direct_mode as &dyn IsMenuItem<DynRuntime>,
+            rule_mode as &dyn IsMenuItem<Wry>,
+            global_mode as &dyn IsMenuItem<Wry>,
+            direct_mode as &dyn IsMenuItem<Wry>,
         ]);
     } else if let Some(ref outbound_modes) = outbound_modes {
         menu_items.push(outbound_modes);
@@ -1056,14 +1052,14 @@ async fn create_tray_menu(
 
     menu_items.extend_from_slice(&[
         separator,
-        system_proxy as &dyn IsMenuItem<DynRuntime>,
-        tun_mode as &dyn IsMenuItem<DynRuntime>,
+        system_proxy as &dyn IsMenuItem<Wry>,
+        tun_mode as &dyn IsMenuItem<Wry>,
         separator,
-        lightweight_mode as &dyn IsMenuItem<DynRuntime>,
-        open_dir as &dyn IsMenuItem<DynRuntime>,
-        more as &dyn IsMenuItem<DynRuntime>,
+        lightweight_mode as &dyn IsMenuItem<Wry>,
+        open_dir as &dyn IsMenuItem<Wry>,
+        more as &dyn IsMenuItem<Wry>,
         separator,
-        quit as &dyn IsMenuItem<DynRuntime>,
+        quit as &dyn IsMenuItem<Wry>,
     ]);
 
     let menu = tauri::menu::MenuBuilder::new(app_handle).items(&menu_items).build()?;

src-tauri/src/core/tray/speed_task.rs

@@ -132,7 +132,7 @@ impl TraySpeedController {
 
         let app_handle = handle::Handle::app_handle();
         if let Some(tray) = app_handle.tray_by_id(super::TRAY_ID) {
-            let result = tray.with_inner_blocking(|inner| {
+            let result = tray.with_inner_tray_icon(|inner| {
                 if let Some(status_item) = inner.ns_status_item() {
                     tray_speed::clear_speed_attributed_title(&status_item);
                 }
@@ -167,7 +167,7 @@ impl TraySpeedController {
     fn apply_tray_speed(up: u64, down: u64) {
         let app_handle = handle::Handle::app_handle();
         if let Some(tray) = app_handle.tray_by_id(super::TRAY_ID) {
-            let result = tray.with_inner_blocking(move |inner| {
+            let result = tray.with_inner_tray_icon(move |inner| {
                 if let Some(status_item) = inner.ns_status_item() {
                     tray_speed::set_speed_attributed_title(&status_item, up, down);
                 }

src-tauri/src/feat/window.rs

@@ -130,7 +130,7 @@ pub async fn open_or_close_dashboard() {
     logging!(info, Type::Window, "Window toggle result: {result:?}");
 }
 
-pub async fn quit() -> clash_verge_signal::ShutdownOutcome {
+pub async fn quit() {
     logging!(debug, Type::System, "启动退出流程");
     // 设置退出标志
     handle::Handle::global().set_is_exiting();
@@ -165,13 +165,11 @@ pub async fn quit() -> clash_verge_signal::ShutdownOutcome {
             NoticeStatus::AppQuitCoreStopFailed,
             cleanup_result.stop_error.unwrap_or_default(),
         );
-        return clash_verge_signal::ShutdownOutcome::Canceled;
     }
 
     utils::server::shutdown_embedded_server();
     let app_handle = handle::Handle::app_handle();
     app_handle.exit(if cleanup_result.all_success { 0 } else { 1 });
-    clash_verge_signal::ShutdownOutcome::Committed
 }
 
 pub async fn clean_async() -> CleanupResult {

src-tauri/src/ipc.rs

@@ -1,12 +1,12 @@
 use crate::cmd;
 
-pub fn builder() -> tauri_specta::Builder<tauri::DynRuntime> {
+pub fn builder() -> tauri_specta::Builder<tauri::Wry> {
     tauri_specta::Builder::new()
         .types(&platform_types())
         .commands(tauri_specta::collect_commands![
             tauri_plugin_clash_verge_sysinfo::commands::get_system_info,
             tauri_plugin_clash_verge_sysinfo::commands::get_app_uptime,
-            tauri_plugin_clash_verge_sysinfo::commands::export_diagnostic_info::<tauri::DynRuntime>,
+            tauri_plugin_clash_verge_sysinfo::commands::export_diagnostic_info::<tauri::Wry>,
             cmd::probe_listener,
             cmd::save_proxy_ports,
             cmd::get_sys_proxy,

src-tauri/src/lib.rs

@@ -40,7 +40,7 @@ mod app_init {
     }
 
     /// Setup plugins for the Tauri builder
-    pub fn setup_plugins(builder: tauri::Builder) -> tauri::Builder {
+    pub fn setup_plugins(builder: tauri::Builder<tauri::Wry>) -> tauri::Builder<tauri::Wry> {
         #[allow(unused_mut)]
         let mut builder = builder
             .plugin(tauri_plugin_clash_verge_sysinfo::init())
@@ -124,7 +124,7 @@ mod app_init {
         Ok(())
     }
 
-    pub fn generate_handlers() -> impl Fn(tauri::ipc::Invoke) -> bool + Send + Sync + 'static {
+    pub fn generate_handlers() -> impl Fn(tauri::ipc::Invoke<tauri::Wry>) -> bool + Send + Sync + 'static {
         {
             let builder = crate::ipc::builder();
             move |invoke| builder.invoke_handler()(invoke)
@@ -181,7 +181,7 @@ pub fn run() -> std::process::ExitCode {
     #[cfg(target_os = "linux")]
     utils::linux::workarounds::apply_wayland_webkit_fix();
 
-    let builder = app_init::setup_plugins(tauri::Builder::default().runtime(tauri_runtime_wry::Wry::default()))
+    let builder = app_init::setup_plugins(tauri::Builder::default())
         .setup(|app| {
             // Logger may not be ready yet, so mirror setup panics to stderr.
             fn log_setup_panic(stage: &str, panic: Box<dyn std::any::Any + Send>) {
@@ -230,6 +230,7 @@ pub fn run() -> std::process::ExitCode {
             if let Err(panic) = std::panic::catch_unwind(std::panic::AssertUnwindSafe(|| {
                 resolve::resolve_setup_async();
                 resolve::resolve_setup_sync();
+                #[cfg(target_os = "linux")]
                 resolve::init_signal();
             })) {
                 log_setup_panic("window-core", panic);

src-tauri/src/main.rs

@@ -1,11 +1,22 @@
 #![cfg_attr(not(debug_assertions), windows_subsystem = "windows")]
 
 use std::process::ExitCode;
+#[cfg(not(all(feature = "perf-harness", target_os = "macos")))]
 use std::sync::atomic::{AtomicUsize, Ordering};
 
+#[cfg(all(feature = "perf-harness", target_os = "macos"))]
+#[path = "../../scripts/perf/app.rs"]
+mod perf;
+
+#[cfg(all(feature = "perf-harness", target_os = "macos"))]
+fn main() -> ExitCode {
+    perf::run()
+}
+
+#[cfg(not(all(feature = "perf-harness", target_os = "macos")))]
 fn main() -> ExitCode {
     let default_parallelism = std::thread::available_parallelism().map(|n| n.get()).unwrap_or(1);
-    let worker_limit = std::cmp::min(default_parallelism, 8);
+    let worker_limit = std::cmp::min(default_parallelism, 4);
     let blocking_limit = 2 * worker_limit;
 
     #[allow(clippy::unwrap_used)]

src-tauri/src/utils/resolve/mod.rs

@@ -20,7 +20,6 @@ use crate::{
     utils::{init, server, window_manager::WindowManager},
 };
 use clash_verge_logging::{Type, logging, logging_error};
-use clash_verge_signal;
 
 #[cfg(target_os = "macos")]
 pub mod dns;
@@ -189,6 +188,8 @@ async fn init_silent_updater() {
     logging!(info, Type::Setup, "Silent updater initialized");
 }
 
+// Upstream has no session-end signal support on Linux; see crates/clash-verge-signal.
+#[cfg(target_os = "linux")]
 pub(crate) fn init_signal() {
     logging!(debug, Type::Setup, "Initializing signal handlers...");
     clash_verge_signal::register(feat::quit);

src-tauri/src/utils/resolve/window.rs

@@ -132,10 +132,7 @@ pub fn take_webview_needs_reload() -> bool {
 /// reload visible webviews immediately, and defer a hidden main-window reload until activation.
 /// Registering this callback replaces Tauri's default automatic reload.
 #[cfg(target_os = "macos")]
-pub fn on_web_content_process_terminated(
-    webview: &tauri::Webview,
-    _termination: &tauri::webview::WebContentProcessTermination,
-) {
+pub fn on_web_content_process_terminated(webview: &tauri::Webview) {
     if handle::Handle::global().is_exiting() {
         return;
     }

src-tauri/src/utils/server.rs

@@ -39,8 +39,6 @@ static INSTANCE_LOCK: OnceLock<std::fs::File> = OnceLock::new();
 const PAC_INITIAL_AVAILABLE: bool = false;
 static PAC_AVAILABLE: AtomicBool = AtomicBool::new(PAC_INITIAL_AVAILABLE);
 static COMMANDS_READY: AtomicBool = AtomicBool::new(false);
-#[cfg(feature = "verge-dev")]
-static DEV_QUIT_REQUESTED: AtomicBool = AtomicBool::new(false);
 
 #[derive(Debug, Clone, Copy, PartialEq, Eq)]
 pub enum SingletonDisposition {
@@ -164,55 +162,12 @@ fn instance_auth(token: String) -> impl warp::Filter<Extract = (), Error = warp:
         .untuple_one()
 }
 
-#[cfg(feature = "verge-dev")]
-fn dev_quit_route<F>(
-    token: String,
-    commands_ready: &'static AtomicBool,
-    quit_requested: &'static AtomicBool,
-    trigger: F,
-) -> impl warp::Filter<Extract = (impl warp::Reply,), Error = warp::Rejection> + Clone
-where
-    F: Fn() + Clone + Send + Sync + 'static,
-{
-    instance_auth(token)
-        .and(warp::path!("commands" / "dev" / "quit"))
-        .and(warp::post())
-        .and_then(move || {
-            let trigger = trigger.clone();
-            async move {
-                if !commands_ready.load(Ordering::Acquire) {
-                    return Ok::<_, warp::Rejection>(warp::reply::with_status(
-                        String::from("starting"),
-                        warp::http::StatusCode::SERVICE_UNAVAILABLE,
-                    ));
-                }
-                if quit_requested
-                    .compare_exchange(false, true, Ordering::AcqRel, Ordering::Acquire)
-                    .is_ok()
-                {
-                    trigger();
-                }
-                Ok(warp::reply::with_status(
-                    String::from("accepted"),
-                    warp::http::StatusCode::ACCEPTED,
-                ))
-            }
-        })
-}
-
-#[cfg(feature = "verge-dev")]
-fn release_dev_quit_latch(quit_requested: &AtomicBool, outcome: clash_verge_signal::ShutdownOutcome) {
-    if matches!(outcome, clash_verge_signal::ShutdownOutcome::Canceled) {
-        quit_requested.store(false, Ordering::Release);
-    }
-}
-
 fn start_embedded_server(listener: tokio::net::TcpListener, token: String) {
     let (shutdown_tx, shutdown_rx) = oneshot::channel();
     let _ = SHUTDOWN_SENDER.set(Mutex::new(Some(shutdown_tx)));
 
     #[cfg(feature = "verge-dev")]
-    let auth = instance_auth(token.clone());
+    let auth = instance_auth(token);
     #[cfg(not(feature = "verge-dev"))]
     let auth = instance_auth(token);
 
@@ -278,12 +233,6 @@ fn start_embedded_server(listener: tokio::net::TcpListener, token: String) {
         });
 
     let commands = auth.clone().and(visible).or(auth.and(scheme)).or(pac);
-    #[cfg(feature = "verge-dev")]
-    let commands = commands.or(dev_quit_route(token, &COMMANDS_READY, &DEV_QUIT_REQUESTED, || {
-        AsyncHandler::spawn(|| async {
-            release_dev_quit_latch(&DEV_QUIT_REQUESTED, crate::feat::quit().await);
-        });
-    }));
     AsyncHandler::spawn(move || async move {
         warp::serve(commands)
             .incoming(listener)

src-tauri/src/utils/tray_speed.rs

@@ -27,8 +27,12 @@ const TRAY_STATUS_ITEM_EXTRA_WIDTH: f64 = 30.0;
 const TRAY_STATUS_ITEM_MIN_LENGTH: f64 = 58.0;
 const NS_VARIABLE_STATUS_ITEM_LENGTH: f64 = -1.0;
 
+/// (button_height, mono_advance, attributes).
+type CachedAttrs = (f64, f64, Retained<NSDictionary<NSString, AnyObject>>);
+
 thread_local! {
     static LAST_DISPLAY_STR: RefCell<String> = const { RefCell::new(String::new()) };
+    static CACHED_ATTRS: RefCell<Option<CachedAttrs>> = const { RefCell::new(None) };
 }
 
 fn format_tray_speed(up: u64, down: u64) -> String {
@@ -74,8 +78,26 @@ fn create_attributed_string(
     }
 }
 
-fn status_item_length_for_speed(attr_str: &NSAttributedString) -> f64 {
-    (attr_str.size().width.ceil() + TRAY_STATUS_ITEM_EXTRA_WIDTH).max(TRAY_STATUS_ITEM_MIN_LENGTH)
+/// Attributes and per-glyph advance, rebuilt only when the button height changes.
+fn cached_attributes(button_height: f64) -> (f64, Retained<NSDictionary<NSString, AnyObject>>) {
+    CACHED_ATTRS.with(|cache| {
+        if let Some((height, advance, attrs)) = cache.borrow().as_ref()
+            && *height == button_height
+        {
+            return (*advance, attrs.clone());
+        }
+        let attrs = build_attributes(button_height);
+        let probe = NSString::from_str("0");
+        let advance = create_attributed_string(&probe, Some(&attrs)).size().width;
+        *cache.borrow_mut() = Some((button_height, advance, attrs.clone()));
+        (advance, attrs)
+    })
+}
+
+/// Longest line times the monospaced advance; matches `size().width` for the ASCII-only speed text.
+fn arithmetic_width(text: &str, advance: f64) -> f64 {
+    let glyphs = text.split('\n').map(str::len).max().unwrap_or(0) as f64;
+    glyphs * advance
 }
 
 fn sync_click_target_frame(button: &NSStatusBarButton) {
@@ -89,7 +111,7 @@ fn sync_click_target_frame(button: &NSStatusBarButton) {
 }
 
 /// `with_inner_tray_icon` should run this on the main thread; fail safely if it does not.
-fn apply_status_item_attributed_title(status_item: &NSStatusItem, text: &NSString, show_speed: bool) {
+fn apply_status_item_attributed_title(status_item: &NSStatusItem, text: &str, show_speed: bool) {
     let Some(mtm) = MainThreadMarker::new() else {
         logging!(warn, Type::Tray, "托盘速率富文本设置跳过：非主线程调用");
         return;
@@ -97,17 +119,19 @@ fn apply_status_item_attributed_title(status_item: &NSStatusItem, text: &NSStrin
     let Some(button) = status_item.button(mtm) else {
         return;
     };
+    let ns_string = NSString::from_str(text);
     let attr_str = if show_speed {
-        let attrs = build_attributes(button.bounds().size.height);
+        let (advance, attrs) = cached_attributes(button.bounds().size.height);
         let attrs: &NSDictionary<NSString, AnyObject> = &attrs;
-        let attr_str = create_attributed_string(text, Some(attrs));
-        let length = status_item_length_for_speed(&attr_str);
+        let attr_str = create_attributed_string(&ns_string, Some(attrs));
+        let width = arithmetic_width(text, advance);
+        let length = (width.ceil() + TRAY_STATUS_ITEM_EXTRA_WIDTH).max(TRAY_STATUS_ITEM_MIN_LENGTH);
         if status_item.length() != length {
             status_item.setLength(length);
         }
         attr_str
     } else {
-        create_attributed_string(text, None)
+        create_attributed_string(&ns_string, None)
     };
     button.setAttributedTitle(&attr_str);
     sync_click_target_frame(&button);
@@ -121,8 +145,7 @@ pub fn set_speed_attributed_title(status_item: &NSStatusItem, up: u64, down: u64
             return;
         }
         *last = speed_text;
-        let ns_string = NSString::from_str(last.as_str());
-        apply_status_item_attributed_title(status_item, &ns_string, true);
+        apply_status_item_attributed_title(status_item, last.as_str(), true);
     });
 }
 
@@ -130,7 +153,6 @@ pub fn clear_speed_attributed_title(status_item: &NSStatusItem) {
     LAST_DISPLAY_STR.with(|last| {
         last.borrow_mut().clear();
     });
-    let empty = NSString::from_str("");
     status_item.setLength(NS_VARIABLE_STATUS_ITEM_LENGTH);
-    apply_status_item_attributed_title(status_item, &empty, false);
+    apply_status_item_attributed_title(status_item, "", false);
 }

src-tauri/src/utils/window_manager.rs

@@ -4,7 +4,7 @@ use clash_verge_logging::{Type, logging};
 use std::pin::Pin;
 use std::sync::LazyLock;
 use std::time::Duration;
-use tauri::{Manager as _, WebviewWindow};
+use tauri::{Manager as _, WebviewWindow, Wry};
 
 #[derive(Debug, Clone, Copy, PartialEq)]
 pub enum WindowOperationResult {
@@ -50,7 +50,7 @@ impl WindowManager {
         handle::Handle::global().set_activation_policy_regular();
     }
 
-    fn get_main_window_with_state() -> (Option<WebviewWindow>, WindowState) {
+    fn get_main_window_with_state() -> (Option<WebviewWindow<Wry>>, WindowState) {
         let Some(window) = Self::get_main_window() else {
             return (None, WindowState::NotExist);
         };
@@ -76,7 +76,7 @@ impl WindowManager {
         Self::get_main_window_with_state().1
     }
 
-    pub fn get_main_window() -> Option<WebviewWindow> {
+    pub fn get_main_window() -> Option<WebviewWindow<Wry>> {
         let app_handle = handle::Handle::app_handle();
         app_handle.get_webview_window("main")
     }
@@ -147,7 +147,7 @@ impl WindowManager {
         }
     }
 
-    fn hide_main_window(window: Option<&WebviewWindow>) -> WindowOperationResult {
+    fn hide_main_window(window: Option<&WebviewWindow<Wry>>) -> WindowOperationResult {
         logging!(debug, Type::Window, "窗口可见，将隐藏窗口");
         if let Some(window) = window {
             match window.close() {
@@ -166,7 +166,7 @@ impl WindowManager {
         }
     }
 
-    fn activate_existing_main_window(window: Option<&WebviewWindow>) -> WindowOperationResult {
+    fn activate_existing_main_window(window: Option<&WebviewWindow<Wry>>) -> WindowOperationResult {
         logging!(debug, Type::Window, "窗口存在但被隐藏或最小化，将激活窗口");
         if let Some(window) = window {
             Self::activate_window(window)
@@ -176,7 +176,7 @@ impl WindowManager {
         }
     }
 
-    fn activate_window(window: &WebviewWindow) -> WindowOperationResult {
+    fn activate_window(window: &WebviewWindow<Wry>) -> WindowOperationResult {
         logging!(debug, Type::Window, "开始激活窗口");
         #[cfg(target_os = "macos")]
         Self::set_macos_activation_policy_regular();
@@ -233,15 +233,15 @@ impl WindowManager {
         }
     }
 
-    pub fn is_main_window_visible(window: Option<&WebviewWindow>) -> bool {
+    pub fn is_main_window_visible(window: Option<&WebviewWindow<Wry>>) -> bool {
         window.map(|w| w.is_visible().unwrap_or(false)).unwrap_or(false)
     }
 
-    pub fn is_main_window_focused(window: Option<&WebviewWindow>) -> bool {
+    pub fn is_main_window_focused(window: Option<&WebviewWindow<Wry>>) -> bool {
         window.map(|w| w.is_focused().unwrap_or(false)).unwrap_or(false)
     }
 
-    fn is_main_window_minimized(window: Option<&WebviewWindow>) -> bool {
+    fn is_main_window_minimized(window: Option<&WebviewWindow<Wry>>) -> bool {
         window.map(|w| w.is_minimized().unwrap_or(false)).unwrap_or(false)
     }
 

src/components/home/system-info-card.tsx

@@ -101,7 +101,7 @@ export const SystemInfoCard = () => {
     try {
       const result = await triggerCheckUpdate()
       const info = result.data
-      if (!info) {
+      if (!info?.available) {
         showNotice.success(
           'settings.components.verge.advanced.notifications.latestVersion',
         )

src/components/layout/update-button.tsx

@@ -16,7 +16,7 @@ export const UpdateButton = (props: Props) => {
 
   const { updateInfo } = useUpdate()
 
-  if (!updateInfo) return null
+  if (!updateInfo?.available) return null
 
   return (
     <>

src/components/setting/mods/backup-config-viewer.tsx

@@ -1,20 +1,11 @@
-import Visibility from '@mui/icons-material/Visibility'
-import VisibilityOff from '@mui/icons-material/VisibilityOff'
-import {
-  TextField,
-  Button,
-  Grid,
-  Stack,
-  IconButton,
-  InputAdornment,
-} from '@mui/material'
+import { Button, Grid, Stack, TextField } from '@mui/material'
 import { useLockFn } from 'ahooks'
-import { useState, useRef, memo, useEffect } from 'react'
+import { memo, useEffect, useRef } from 'react'
 import { useForm } from 'react-hook-form'
 import { useTranslation } from 'react-i18next'
 
 import { useVerge } from '@/hooks/use-verge'
-import { saveWebdavConfig, createWebdavBackup } from '@/services/cmds'
+import { createWebdavBackup, saveWebdavConfig } from '@/services/cmds'
 import { mutate } from '@/services/mutate'
 import { errorDetail, showNotice } from '@/services/notice-service'
 import {
@@ -43,7 +34,6 @@ export const BackupConfigViewer = memo(
     const { t } = useTranslation()
     const { verge, mutateVerge } = useVerge()
     const { webdav_url, webdav_username, webdav_password } = verge || {}
-    const [showPassword, setShowPassword] = useState(false)
     const usernameRef = useRef<HTMLInputElement>(null)
     const passwordRef = useRef<HTMLInputElement>(null)
     const urlRef = useRef<HTMLInputElement>(null)
@@ -68,10 +58,6 @@ export const BackupConfigViewer = memo(
     const webdavStatus = getWebdavStatus(webdavSignature)
     const shouldAutoInit = webdavStatus !== 'failed'
 
-    const handleClickShowPassword = () => {
-      setShowPassword((prev) => !prev)
-    }
-
     useEffect(() => {
       if (!webdav_url || !webdav_username || !webdav_password) {
         return
@@ -215,7 +201,7 @@ export const BackupConfigViewer = memo(
               <Grid size={{ xs: 6 }}>
                 <TextField
                   label={t('shared.labels.password')}
-                  type={showPassword ? 'text' : 'password'}
+                  type="password"
                   variant="outlined"
                   size="small"
                   autoCorrect="off"
@@ -223,20 +209,6 @@ export const BackupConfigViewer = memo(
                   spellCheck="false"
                   inputRef={passwordRef}
                   {...register('password')}
-                  slotProps={{
-                    input: {
-                      endAdornment: (
-                        <InputAdornment position="end">
-                          <IconButton
-                            onClick={handleClickShowPassword}
-                            edge="end"
-                          >
-                            {showPassword ? <VisibilityOff /> : <Visibility />}
-                          </IconButton>
-                        </InputAdornment>
-                      ),
-                    },
-                  }}
                 />
               </Grid>
             </Grid>

src/components/setting/setting-verge-advanced.tsx

@@ -48,7 +48,7 @@ const SettingVergeAdvanced = ({ onError: _ }: Props) => {
     try {
       const info = await checkUpdate()
       updateLastCheckTime()
-      if (!info) {
+      if (!info?.available) {
         showNotice.success(
           'settings.components.verge.advanced.notifications.latestVersion',
         )

src/components/test/test-item.tsx

@@ -1,5 +1,5 @@
 import { LanguageRounded } from '@mui/icons-material'
-import { Box, Divider, MenuItem, Menu, styled, alpha } from '@mui/material'
+import { alpha, Box, Divider, Menu, MenuItem, styled } from '@mui/material'
 import { useLockFn } from 'ahooks'
 import { useCallback, useEffect, useRef, useState } from 'react'
 import { useTranslation } from 'react-i18next'
@@ -29,8 +29,14 @@ export const TestItem = ({ itemData, onEdit, onDelete: removeTest }: Props) => {
 
   const onDelay = useCallback(async () => {
     setDelay(-2)
-    const result = await cmdTestDelay(url!)
-    setDelay(result)
+    try {
+      const result = await cmdTestDelay(url!)
+      setDelay(result)
+    } catch (err) {
+      // A failed test must not leave the item stuck in the loading state.
+      setDelay(-1)
+      showNotice.error(err)
+    }
   }, [url])
 
   const onEditTest = () => {

src/components/test/test-viewer.tsx

@@ -7,10 +7,8 @@ import { useTranslation } from 'react-i18next'
 
 import { BaseDialog } from '@/components/base'
 import { useVerge } from '@/hooks/use-verge'
-import type { IVergeTestItem_Serialize } from '@/services/bindings'
 import { showNotice } from '@/services/notice-service'
 
-
 interface Props {
   onChange: (uid: string, patch?: Partial<IVergeTestItem>) => void
 }
@@ -79,12 +77,7 @@ export const TestViewer = forwardRef<TestViewerRef, Props>(
 
           if (openType === 'new') {
             const uid = nanoid()
-            const item: IVergeTestItem_Serialize = {
-              uid,
-              name: form.name ?? null,
-              icon: form.icon ?? null,
-              url: form.url ?? null,
-            }
+            const item = { ...form, uid }
             const newList = [...testList, item]
             await patchVerge({ test_list: newList })
             onChange(uid)

src/services/bindings.ts

@@ -53,11 +53,16 @@ export const commands = {
   /**  Reads the saved mode without depending on strict mihomo `/configs` deserialization. */
   getClashMode: () => __TAURI_INVOKE<string | null>('get_clash_mode'),
   changeClashCore: (clashCore: string) =>
-    __TAURI_INVOKE<CommandFailure_Serialize | null>('change_clash_core', {
-      clashCore,
-    }),
+    __TAURI_INVOKE<{
+      /**  Stable frontend identifier, when classified. */
+      code?: string | null
+      /**  Human-readable diagnostic detail. */
+      detail: string
+      /**  Requested operation when known by the command. */
+      operation?: FailedOperation | null
+    } | null>('change_clash_core', { clashCore }),
   getRuntimeConfig: () =>
-    __TAURI_INVOKE<YamlMapping | null>('get_runtime_config'),
+    __TAURI_INVOKE<{ [key in string]: JsonValue } | null>('get_runtime_config'),
   getProxyView: () => __TAURI_INVOKE<ProxyViewV1_Serialize>('get_proxy_view'),
   getRuntimeYaml: () => __TAURI_INVOKE<string>('get_runtime_yaml'),
   getRuntimeLogs: () => __TAURI_INVOKE<RuntimeLogs>('get_runtime_logs'),
@@ -65,7 +70,7 @@ export const commands = {
     __TAURI_INVOKE<string>('get_runtime_proxy_chain_config', {
       proxyChainExitNode,
     }),
-  updateProxyChainConfigInRuntime: (proxyChainConfig: YamlValue | null) =>
+  updateProxyChainConfigInRuntime: (proxyChainConfig: JsonValue | null) =>
     __TAURI_INVOKE<ValidationOutcome>('update_proxy_chain_config_in_runtime', {
       proxyChainConfig,
     }),
@@ -95,11 +100,18 @@ export const commands = {
   takeDnsOverrideNotice: () =>
     __TAURI_INVOKE<boolean>('take_dns_override_notice'),
   takeServiceFallbackNotice: () =>
-    __TAURI_INVOKE<ServiceFallbackNotice | null>(
-      'take_service_fallback_notice',
-    ),
+    __TAURI_INVOKE<
+      | { kind: 'unavailable' }
+      | { kind: 'coreRejected'; reason: string }
+      | { kind: 'notAutoStarted' }
+      | null
+    >('take_service_fallback_notice'),
   getCoreStartupError: () =>
-    __TAURI_INVOKE<CoreFailure | null>('get_core_startup_error'),
+    __TAURI_INVOKE<
+      | { kind: 'startFailed'; detail: string }
+      | { kind: 'serviceCoreStopped'; detail: string }
+      | null
+    >('get_core_startup_error'),
   takeServiceRepairNotice: () =>
     __TAURI_INVOKE<boolean>('take_service_repair_notice'),
   takeServiceOwnerNotice: () =>
@@ -128,7 +140,7 @@ export const commands = {
     __TAURI_INVOKE<NetworkInterfaceView[]>('get_network_interfaces_info'),
   getProfiles: () => __TAURI_INVOKE<IProfiles_Serialize>('get_profiles'),
   enhanceProfiles: () => __TAURI_INVOKE<ValidationOutcome>('enhance_profiles'),
-  patchProfilesConfig: (profiles: ProfileSelection_Deserialize) =>
+  patchProfilesConfig: (profiles: ProfileSelection) =>
     __TAURI_INVOKE<ValidationOutcome>('patch_profiles_config', { profiles }),
   viewProfile: (index: string) =>
     __TAURI_INVOKE<null>('view_profile', { index }),
@@ -136,12 +148,52 @@ export const commands = {
     __TAURI_INVOKE<null>('patch_profile', { index, profile }),
   createProfile: (item: ProfileCreate_Deserialize, fileData: string | null) =>
     __TAURI_INVOKE<null>('create_profile', { item, fileData }),
-  importProfile: (url: string, option: PrfOption_Deserialize | null) =>
-    __TAURI_INVOKE<null>('import_profile', { url, option }),
+  importProfile: (
+    url: string,
+    option: {
+      user_agent?: string | null
+      with_proxy?: boolean | null
+      self_proxy?: boolean | null
+      update_interval?: number | null
+      /**
+       *  HTTP request timeout in seconds
+       *  default is 60 seconds
+       */
+      timeout_seconds?: number | null
+      /**  default is `false` */
+      danger_accept_invalid_certs?: boolean | null
+      allow_auto_update?: boolean | null
+      merge?: string | null
+      script?: string | null
+      rules?: string | null
+      proxies?: string | null
+      groups?: string | null
+    } | null,
+  ) => __TAURI_INVOKE<null>('import_profile', { url, option }),
   reorderProfile: (activeId: string, overId: string) =>
     __TAURI_INVOKE<null>('reorder_profile', { activeId, overId }),
-  updateProfile: (index: string, option: PrfOption_Deserialize | null) =>
-    __TAURI_INVOKE<null>('update_profile', { index, option }),
+  updateProfile: (
+    index: string,
+    option: {
+      user_agent?: string | null
+      with_proxy?: boolean | null
+      self_proxy?: boolean | null
+      update_interval?: number | null
+      /**
+       *  HTTP request timeout in seconds
+       *  default is 60 seconds
+       */
+      timeout_seconds?: number | null
+      /**  default is `false` */
+      danger_accept_invalid_certs?: boolean | null
+      allow_auto_update?: boolean | null
+      merge?: string | null
+      script?: string | null
+      rules?: string | null
+      proxies?: string | null
+      groups?: string | null
+    } | null,
+  ) => __TAURI_INVOKE<null>('update_profile', { index, option }),
   deleteProfile: (index: string) =>
     __TAURI_INVOKE<null>('delete_profile', { index }),
   readProfileFile: (index: string) =>
@@ -211,11 +263,11 @@ export type CommandFailure_Deserialize = {
 /**  Structured command failure returned to the frontend. */
 export type CommandFailure_Serialize = {
   /**  Stable frontend identifier, when classified. */
-  code?: string
+  code?: string | null
   /**  Human-readable diagnostic detail. */
   detail: string
   /**  Requested operation when known by the command. */
-  operation?: FailedOperation
+  operation?: FailedOperation | null
 }
 
 /**  Why the Core is not running, kept until a Core starts again. */
@@ -278,27 +330,14 @@ export type IProfiles_Serialize = {
 /**  ### `verge.yaml` schema */
 export type IVerge = IVerge_Serialize | IVerge_Deserialize
 
-export type IVergeTestItem =
-  | IVergeTestItem_Serialize
-  | IVergeTestItem_Deserialize
-
-export type IVergeTestItem_Deserialize = {
+export type IVergeTestItem = {
   uid?: string | null
   name?: string | null
   icon?: string | null
   url?: string | null
 }
 
-export type IVergeTestItem_Serialize = {
-  uid: string | null
-  name: string | null
-  icon: string | null
-  url: string | null
-}
-
-export type IVergeTheme = IVergeTheme_Serialize | IVergeTheme_Deserialize
-
-export type IVergeTheme_Deserialize = {
+export type IVergeTheme = {
   primary_color?: string | null
   secondary_color?: string | null
   primary_text?: string | null
@@ -311,19 +350,6 @@ export type IVergeTheme_Deserialize = {
   css_injection?: string | null
 }
 
-export type IVergeTheme_Serialize = {
-  primary_color: string | null
-  secondary_color: string | null
-  primary_text: string | null
-  secondary_text: string | null
-  info_color: string | null
-  error_color: string | null
-  warning_color: string | null
-  success_color: string | null
-  font_family: string | null
-  css_injection: string | null
-}
-
 /**  ### `verge.yaml` schema */
 export type IVerge_Deserialize = {
   /**  silent | error | warn | info | debug | trace */
@@ -366,7 +392,7 @@ export type IVerge_Deserialize = {
   proxy_auto_config?: boolean | null
   pac_file_content?: string | null
   proxy_host?: string | null
-  theme_setting?: IVergeTheme_Deserialize | null
+  theme_setting?: IVergeTheme | null
   web_ui_list?: string[] | null
   clash_core?: string | null
   /**  format: {func},{key} */
@@ -382,7 +408,7 @@ export type IVerge_Deserialize = {
   auto_delay_detection_interval_minutes?: number | null
   enable_builtin_enhanced?: boolean | null
   proxy_layout_column?: number | null
-  test_list?: IVergeTestItem_Deserialize[] | null
+  test_list?: IVergeTestItem[] | null
   /**  0: 不清理; 1: 1天；2: 7天; 3: 30天; 4: 90天 */
   auto_log_clean?: number | null
   enable_auto_backup_schedule?: boolean | null
@@ -431,13 +457,13 @@ export type IVerge_Serialize = {
   traffic_graph: boolean | null
   /**  show memory info (only for Clash Meta) */
   enable_memory_usage: boolean | null
-  enable_group_icon?: boolean
+  enable_group_icon?: boolean | null
   pause_render_traffic_stats_on_blur: boolean | null
-  common_tray_icon?: boolean
-  menu_icon?: string
-  menu_order?: string[]
-  proxy_group_tools_position?: string
-  notice_position?: string
+  common_tray_icon?: boolean | null
+  menu_icon?: string | null
+  menu_order?: string[] | null
+  proxy_group_tools_position?: string | null
+  notice_position?: string | null
   collapse_navbar: boolean | null
   sysproxy_tray_icon: boolean | null
   tun_tray_icon: boolean | null
@@ -456,11 +482,11 @@ export type IVerge_Serialize = {
   proxy_auto_config: boolean | null
   pac_file_content: string | null
   proxy_host: string | null
-  theme_setting: IVergeTheme_Serialize | null
+  theme_setting: IVergeTheme | null
   web_ui_list: string[] | null
-  clash_core?: string
+  clash_core?: string | null
   /**  format: {func},{key} */
-  hotkeys?: string[]
+  hotkeys?: string[] | null
   enable_global_hotkey: boolean | null
   home_cards: JsonValue | null
   auto_close_connection: boolean | null
@@ -472,7 +498,7 @@ export type IVerge_Serialize = {
   auto_delay_detection_interval_minutes: number | null
   enable_builtin_enhanced: boolean | null
   proxy_layout_column: number | null
-  test_list: IVergeTestItem_Serialize[] | null
+  test_list: IVergeTestItem[] | null
   /**  0: 不清理; 1: 1天；2: 7天; 3: 30天; 4: 90天 */
   auto_log_clean: number | null
   enable_auto_backup_schedule: boolean | null
@@ -484,10 +510,10 @@ export type IVerge_Serialize = {
   verge_socks_enabled: boolean | null
   verge_port: number | null
   verge_http_enabled: boolean | null
-  webdav_url?: string
-  webdav_username?: string
-  webdav_password?: string
-  tray_proxy_groups_display_mode?: string
+  webdav_url?: string | null
+  webdav_username?: string | null
+  webdav_password?: string | null
+  tray_proxy_groups_display_mode?: string | null
   tray_inline_outbound_modes: boolean | null
   enable_auto_light_weight_mode: boolean | null
   /**  自动进入轻量模式的延迟（分钟） */
@@ -632,7 +658,7 @@ export type PrfItem_Deserialize = {
   file?: string | null
   desc?: string | null
   url?: string | null
-  selected?: PrfSelected_Deserialize[] | null
+  selected?: PrfSelected[] | null
   latency_test_urls?: { [key in string]: string } | null
   extra?: PrfExtra | null
   updated?: number | null
@@ -646,14 +672,14 @@ export type PrfItem_Serialize = {
   type: string | null
   name: string | null
   file: string | null
-  desc?: string
-  url?: string
-  selected?: PrfSelected_Serialize[]
-  latency_test_urls?: { [key in string]: string }
-  extra?: PrfExtra
+  desc?: string | null
+  url?: string | null
+  selected?: PrfSelected[] | null
+  latency_test_urls?: { [key in string]: string } | null
+  extra?: PrfExtra | null
   updated: number | null
-  option?: PrfOption_Serialize
-  home?: string
+  option?: PrfOption_Serialize | null
+  home?: string | null
 }
 
 export type PrfOption = PrfOption_Serialize | PrfOption_Deserialize
@@ -679,18 +705,18 @@ export type PrfOption_Deserialize = {
 }
 
 export type PrfOption_Serialize = {
-  user_agent?: string
-  with_proxy?: boolean
-  self_proxy?: boolean
-  update_interval?: number
+  user_agent?: string | null
+  with_proxy?: boolean | null
+  self_proxy?: boolean | null
+  update_interval?: number | null
   /**
    *  HTTP request timeout in seconds
    *  default is 60 seconds
    */
-  timeout_seconds?: number
+  timeout_seconds?: number | null
   /**  default is `false` */
-  danger_accept_invalid_certs?: boolean
-  allow_auto_update?: boolean
+  danger_accept_invalid_certs?: boolean | null
+  allow_auto_update?: boolean | null
   merge: string | null
   script: string | null
   rules: string | null
@@ -698,18 +724,11 @@ export type PrfOption_Serialize = {
   groups: string | null
 }
 
-export type PrfSelected = PrfSelected_Serialize | PrfSelected_Deserialize
-
-export type PrfSelected_Deserialize = {
+export type PrfSelected = {
   name?: string | null
   now?: string | null
 }
 
-export type PrfSelected_Serialize = {
-  name: string | null
-  now: string | null
-}
-
 export type ProfileCreate = ProfileCreate_Serialize | ProfileCreate_Deserialize
 
 export type ProfileCreate_Deserialize = {
@@ -739,7 +758,7 @@ export type ProfileDnsSettings_Deserialize = {
 
 export type ProfileDnsSettings_Serialize = {
   enabled: boolean
-  confirmation?: string
+  confirmation?: string | null
 }
 
 export type ProfilePatch = ProfilePatch_Serialize | ProfilePatch_Deserialize
@@ -750,7 +769,7 @@ export type ProfilePatch_Deserialize = {
   desc?: string | null
   file?: string | null
   url?: string | null
-  selected?: PrfSelected_Deserialize[] | null
+  selected?: PrfSelected[] | null
   latency_test_urls?: { [key in string]: string } | null
   extra?: PrfExtra | null
   updated?: number | null
@@ -763,25 +782,17 @@ export type ProfilePatch_Serialize = {
   desc: string | null
   file: string | null
   url: string | null
-  selected: PrfSelected_Serialize[] | null
+  selected: PrfSelected[] | null
   latency_test_urls: { [key in string]: string } | null
   extra: PrfExtra | null
   updated: number | null
   option: PrfOption_Serialize | null
 }
 
-export type ProfileSelection =
-  | ProfileSelection_Serialize
-  | ProfileSelection_Deserialize
-
-export type ProfileSelection_Deserialize = {
+export type ProfileSelection = {
   current?: string | null
 }
 
-export type ProfileSelection_Serialize = {
-  current: string | null
-}
-
 export type ProfileUpdatePayload = {
   uid: string
 }
@@ -814,11 +825,11 @@ export type ProxyGroupView_Deserialize = {
 export type ProxyGroupView_Serialize = {
   name: string
   type: string
-  now?: string
-  fixed?: string
-  hidden?: boolean
-  icon?: string
-  testUrl?: string
+  now?: string | null
+  fixed?: string | null
+  hidden?: boolean | null
+  icon?: string | null
+  testUrl?: string | null
   history: DelayHistory[]
   extra: { [key in string]: ProxyLatencyHistory }
   members: ProxyMemberRef[]
@@ -863,10 +874,10 @@ export type ProxyNodeView_Serialize = {
   type: string
   history: DelayHistory[]
   extra: { [key in string]: ProxyLatencyHistory }
-  id?: string
-  hidden?: boolean
-  icon?: string
-  testUrl?: string
+  id?: string | null
+  hidden?: boolean | null
+  icon?: string | null
+  testUrl?: string | null
   source: ProxyNodeSource
 } & ProxyCapabilities
 
@@ -895,8 +906,8 @@ export type ProxyProviderView_Deserialize = {
 export type ProxyProviderView_Serialize = {
   name: string
   vehicleType: ProxyProviderVehicleType
-  updatedAt?: string
-  subscriptionInfo?: ProxySubscriptionInfo
+  updatedAt?: string | null
+  subscriptionInfo?: ProxySubscriptionInfo | null
   proxyRecordIds: string[]
 }