revert: Support both registry and api for windows sysproxy

src-tauri/Cargo.lock

@@ -2962,9 +2962,9 @@ dependencies = [
 
 [[package]]
 name = "openssl"
-version = "0.10.62"
+version = "0.10.63"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8cde4d2d9200ad5909f8dac647e29482e07c3a35de8a13fce7c9c7747ad9f671"
+checksum = "15c9d69dd87a29568d4d017cfe8ec518706046a05184e5aea92d0af890b803c8"
 dependencies = [
  "bitflags 2.4.2",
  "cfg-if",
@@ -2994,9 +2994,9 @@ checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf"
 
 [[package]]
 name = "openssl-sys"
-version = "0.9.98"
+version = "0.9.99"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c1665caf8ab2dc9aef43d1c0023bd904633a6a05cb30b0ad59bec2ae986e57a7"
+checksum = "22e1bf214306098e4832460f797824c05d25aacdf896f64a985fb0fd992454ae"
 dependencies = [
  "cc",
  "libc",
@@ -4303,9 +4303,9 @@ dependencies = [
 
 [[package]]
 name = "smallvec"
-version = "1.12.0"
+version = "1.13.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2593d31f82ead8df961d8bd23a64c2ccf2eb5dd34b0a34bfb4dd54011c72009e"
+checksum = "e6ecd384b10a64542d77071bd64bd7b231f4ed5940fba55e98c3de13824cf3d7"
 
 [[package]]
 name = "smol"
@@ -4477,7 +4477,7 @@ dependencies = [
 [[package]]
 name = "sysproxy"
 version = "0.3.0"
-source = "git+https://github.com/clash-verge-rev/sysproxy-rs?branch=main#79390614ede8252158bf775ffaabbec04d8a4359"
+source = "git+https://github.com/zzzgydi/sysproxy-rs?branch=main#95a2ba9b609e99dcba21276b2db96c499c06836b"
 dependencies = [
  "interfaces",
  "iptools",
@@ -5392,9 +5392,9 @@ checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a"
 
 [[package]]
 name = "uuid"
-version = "1.6.1"
+version = "1.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5e395fcf16a7a3d8127ec99782007af141946b4795001f876d54fb0d55978560"
+checksum = "f00cc9702ca12d3c81455259621e676d0f7251cec66a21e98fe2e9a37db93b2a"
 dependencies = [
  "getrandom 0.2.12",
 ]

src-tauri/Cargo.toml

@@ -38,7 +38,7 @@ window-shadows = { version = "0.2" }
 tokio = { version = "1", features = ["full"] }
 serde = { version = "1.0", features = ["derive"] }
 reqwest = { version = "0.11", features = ["json", "rustls-tls"] }
-sysproxy = { git="https://github.com/clash-verge-rev/sysproxy-rs", branch = "main" }
+sysproxy = { git="https://github.com/zzzgydi/sysproxy-rs", branch = "main" }
 tauri = { version = "1.5", features = [ "dialog-open", "notification-all", "icon-png", "clipboard-all", "global-shortcut-all", "process-all", "shell-all", "system-tray", "updater", "window-all"] }
 
 [target.'cfg(windows)'.dependencies]

src-tauri/src/config/verge.rs

@@ -58,9 +58,6 @@ pub struct IVerge {
     /// set system proxy bypass
     pub system_proxy_bypass: Option<String>,
 
-    /// set system proxy method
-    pub system_proxy_registry_mode: Option<bool>,
-
     /// proxy guard duration
     pub proxy_guard_duration: Option<u64>,
 
@@ -161,7 +158,6 @@ impl IVerge {
             enable_auto_launch: Some(false),
             enable_silent_start: Some(false),
             enable_system_proxy: Some(false),
-            system_proxy_registry_mode: Some(false),
             enable_random_port: Some(false),
             verge_mixed_port: Some(7897),
             enable_proxy_guard: Some(false),
@@ -209,7 +205,6 @@ impl IVerge {
         patch!(enable_system_proxy);
         patch!(enable_proxy_guard);
         patch!(system_proxy_bypass);
-        patch!(system_proxy_registry_mode);
         patch!(proxy_guard_duration);
 
         patch!(theme_setting);

src-tauri/src/core/sysopt.rs

@@ -58,12 +58,6 @@ impl Sysopt {
             )
         };
 
-        let registry_mode = {
-            let verge = Config::verge();
-            let verge = verge.latest();
-            verge.system_proxy_registry_mode.unwrap_or(false)
-        };
-
         let current = Sysproxy {
             enable,
             host: String::from("127.0.0.1"),
@@ -73,15 +67,7 @@ impl Sysopt {
 
         if enable {
             let old = Sysproxy::get_system_proxy().ok();
-
-            if registry_mode {
-                #[cfg(windows)]
-                current.set_system_proxy_with_registry()?;
-                #[cfg(not(windows))]
-                current.set_system_proxy()?;
-            } else {
-                current.set_system_proxy()?;
-            }
+            current.set_system_proxy()?;
 
             *self.old_sysproxy.lock() = old;
             *self.cur_sysproxy.lock() = Some(current);
@@ -111,13 +97,6 @@ impl Sysopt {
                 verge.system_proxy_bypass.clone(),
             )
         };
-
-        let registry_mode = {
-            let verge = Config::verge();
-            let verge = verge.latest();
-            verge.system_proxy_registry_mode.unwrap_or(false)
-        };
-
         let mut sysproxy = cur_sysproxy.take().unwrap();
 
         sysproxy.enable = enable;
@@ -129,14 +108,7 @@ impl Sysopt {
             .unwrap_or(Config::clash().data().get_mixed_port());
         sysproxy.port = port;
 
-        if registry_mode {
-            #[cfg(windows)]
-            sysproxy.set_system_proxy_with_registry()?;
-            #[cfg(not(windows))]
-            sysproxy.set_system_proxy()?;
-        } else {
-            sysproxy.set_system_proxy()?;
-        }
+        sysproxy.set_system_proxy()?;
         *cur_sysproxy = Some(sysproxy);
 
         Ok(())
@@ -146,11 +118,7 @@ impl Sysopt {
     pub fn reset_sysproxy(&self) -> Result<()> {
         let mut cur_sysproxy = self.cur_sysproxy.lock();
         let mut old_sysproxy = self.old_sysproxy.lock();
-        let registry_mode = {
-            let verge = Config::verge();
-            let verge = verge.latest();
-            verge.system_proxy_registry_mode.unwrap_or(false)
-        };
+
         let cur_sysproxy = cur_sysproxy.take();
 
         if let Some(mut old) = old_sysproxy.take() {
@@ -165,26 +133,12 @@ impl Sysopt {
                 log::info!(target: "app", "reset proxy to the original proxy");
             }
 
-            if registry_mode {
-                #[cfg(windows)]
-                old.set_system_proxy_with_registry()?;
-                #[cfg(not(windows))]
-                old.set_system_proxy()?;
-            } else {
-                old.set_system_proxy()?;
-            }
+            old.set_system_proxy()?;
         } else if let Some(mut cur @ Sysproxy { enable: true, .. }) = cur_sysproxy {
             // 没有原代理，就按现在的代理设置disable即可
             log::info!(target: "app", "reset proxy by disabling the current proxy");
             cur.enable = false;
-            if registry_mode {
-                #[cfg(windows)]
-                cur.set_system_proxy_with_registry()?;
-                #[cfg(not(windows))]
-                cur.set_system_proxy()?;
-            } else {
-                cur.set_system_proxy()?;
-            }
+            cur.set_system_proxy()?;
         } else {
             log::info!(target: "app", "reset proxy with no action");
         }
@@ -303,11 +257,7 @@ impl Sysopt {
         use tokio::time::{sleep, Duration};
 
         let guard_state = self.guard_state.clone();
-        let registry_mode = {
-            let verge = Config::verge();
-            let verge = verge.latest();
-            verge.system_proxy_registry_mode.unwrap_or(false)
-        };
+
         tauri::async_runtime::spawn(async move {
             // if it is running, exit
             let mut state = guard_state.lock().await;
@@ -357,14 +307,8 @@ impl Sysopt {
                     port,
                     bypass: bypass.unwrap_or(DEFAULT_BYPASS.into()),
                 };
-                if registry_mode {
-                    #[cfg(windows)]
-                    log_err!(sysproxy.set_system_proxy_with_registry());
-                    #[cfg(not(windows))]
-                    log_err!(sysproxy.set_system_proxy());
-                } else {
-                    log_err!(sysproxy.set_system_proxy());
-                }
+
+                log_err!(sysproxy.set_system_proxy());
             }
 
             let mut state = guard_state.lock().await;