fix: proxy under AutoConfigUrl

tsukinaha · Nov 20, 2024 · f4af018 · f4af018
1 parent 8e6cb34
commit f4af018
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 2 deletions.
diff --git a/build.rs b/build.rs
@@ -46,6 +46,8 @@ fn main() {
     #[cfg(windows)]
     {
         println!("cargo:rerun-if-changed=tsukimi-manifest.rc");
-        embed_resource::compile("./tsukimi_manifest.rc", embed_resource::NONE);
+        embed_resource::compile("./tsukimi_manifest.rc", embed_resource::NONE)
+            .manifest_optional()
+            .unwrap();
     }
 }
diff --git a/src/client/proxy.rs b/src/client/proxy.rs
@@ -44,7 +44,7 @@ impl ReqClient {
 
             client_builder.build().expect("failed to initialize client")
         };
-        
+
         tower::ServiceBuilder::new()
             .concurrency_limit(SETTINGS.threads() as usize)
             .service(client)
@@ -68,6 +68,16 @@ pub fn get_proxy_settings() -> Option<String> {
         {
             let proxy = PCWSTR(proxy_config.lpszProxy.0).to_string().unwrap();
             return Some(proxy);
+        } else if WinHttpGetIEProxyConfigForCurrentUser(&mut proxy_config).is_ok()
+            && !proxy_config.lpszAutoConfigUrl.is_null()
+        {
+            let proxy_url = PCWSTR(proxy_config.lpszAutoConfigUrl.0)
+                .to_string()
+                .unwrap();
+            let proxy = proxy_url.split('/').collect::<Vec<_>>()[..3]
+                .join("/")
+                .to_string();
+            return Some(proxy);
         }
     }
     None