From 2ce59e17abc16d1a21b91b5a4975445f794bb555 Mon Sep 17 00:00:00 2001 From: oomeow Date: Tue, 11 Aug 2026 21:46:52 +0800 Subject: [PATCH] feat(sysproxy): show explicit hint for missing commands when setting proxy on Linux (#7729) * feat(sysproxy): robust command detection with explicit errors * docs(changelog): add Linux proxy missing command note --- Cargo.lock | 28 +++++++++++++++++++--------- Changelog.md | 1 + 2 files changed, 20 insertions(+), 9 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index a48698932..240036041 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1362,7 +1362,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "117725a109d387c937a1533ce01b450cbde6b88abceea8473c4d7a85853cda3c" dependencies = [ "lazy_static", - "windows-sys 0.59.0", + "windows-sys 0.48.0", ] [[package]] @@ -3405,7 +3405,7 @@ dependencies = [ "libc", "percent-encoding", "pin-project-lite", - "socket2 0.6.5", + "socket2 0.5.10", "system-configuration", "tokio", "tower-service", @@ -3425,7 +3425,7 @@ dependencies = [ "js-sys", "log", "wasm-bindgen", - "windows-core 0.62.2", + "windows-core 0.61.2", ] [[package]] @@ -4838,7 +4838,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7d8fae84b431384b68627d0f9b3b1245fcf9f46f6c0e3dc902e9dce64edd1967" dependencies = [ "libc", - "windows-sys 0.61.2", + "windows-sys 0.45.0", ] [[package]] @@ -5512,7 +5512,7 @@ dependencies = [ "quinn-udp", "rustc-hash", "rustls", - "socket2 0.6.5", + "socket2 0.5.10", "thiserror 2.0.19", "tokio", "tracing", @@ -5551,7 +5551,7 @@ dependencies = [ "cfg_aliases", "libc", "once_cell", - "socket2 0.6.5", + "socket2 0.5.10", "tracing", "windows-sys 0.61.2", ] @@ -5995,7 +5995,7 @@ checksum = "b96d6b6c505282b007a9b009f2aa38b2fd0359b81a0430ceacc60f69ade4c6a0" dependencies = [ "libc", "security-framework-sys", - "which", + "which 4.4.2", "windows-sys 0.48.0", ] @@ -7018,7 +7018,7 @@ dependencies = [ [[package]] name = "sysproxy" version = "0.5.5" -source = "git+https://github.com/clash-verge-rev/sysproxy-rs?branch=main#ca49be5eabcdcc0bae7606e2ed2ff387084f7e81" +source = "git+https://github.com/clash-verge-rev/sysproxy-rs?branch=main#90db88115782cbbf7c527c3c09346260ad2dd939" dependencies = [ "iptools", "log", @@ -7026,6 +7026,7 @@ dependencies = [ "thiserror 2.0.19", "tokio", "url", + "which 8.0.5", "windows 0.62.2", "winreg 0.55.0", "xdg", @@ -9063,6 +9064,15 @@ dependencies = [ "rustix 0.38.44", ] +[[package]] +name = "which" +version = "8.0.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f3ef584124b911bcc3875c2f1472e80f24361ceb789bd1c62b3e9a3df9ff43c" +dependencies = [ + "libc", +] + [[package]] name = "widestring" version = "1.2.1" @@ -9091,7 +9101,7 @@ version = "0.1.11" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c2a7b1c03c876122aa43f3020e6c3c3ee5c05081c9a00739faf7503aeba10d22" dependencies = [ - "windows-sys 0.61.2", + "windows-sys 0.48.0", ] [[package]] diff --git a/Changelog.md b/Changelog.md index e977ca90f..f50014238 100644 --- a/Changelog.md +++ b/Changelog.md @@ -25,5 +25,6 @@ - 新增旧版 Service 迁移引导与 Sidecar 安全回退 - 优化核心启动、停止及更新流程,减少竞态与残留进程 - 优化首页当前节点的交互 +- Linux 代理设置缺失必要命令时,给出明确命令缺失信息,避免模糊报错