interface: add custom proxy

README.md

@@ -60,6 +60,7 @@ The following items are planned in MVP:
 - [x] Nyquest blocking API
 - [x] Nyquest async API
 - [x] Backend: WinRT HttpClient
+- [x] Backend: WinHTTP
 - [x] Backend: libcurl
 - [x] Backend: NSURLSession
 - [x] Backend: reqwest (with WASM support)
@@ -82,7 +83,6 @@ Future work may include:
 - [ ] Telemetry
 - [ ] Backend: Plugin FFI via libloading
 - [ ] Backend: Mock
-- [x] Backend: WinHTTP
 - [ ] Backend: libsoup3
 - [ ] Backend: QNetworkAccessManager
 - [ ] Explore alternative options on Android other than libcurl

backends/curl/src/curl_ng/easy/opt.rs

@@ -11,6 +11,8 @@ use crate::curl_ng::{
     CurlCodeContext, WithCurlCodeContext as _,
 };
 
+const CURLOPT_SUPPRESS_CONNECT_HEADERS: curl_sys::CURLoption = curl_sys::CURLOPTTYPE_LONG + 265;
+
 impl RawEasy {
     pub(super) unsafe fn setopt_str(
         self: Pin<&mut Self>,
@@ -61,6 +63,36 @@ impl RawEasy {
         }
     }
 
+    pub fn set_proxy<'s>(
+        self: Pin<&mut Self>,
+        proxy: impl Into<Cow<'s, str>>,
+    ) -> Result<(), CurlCodeContext> {
+        unsafe {
+            self.setopt_str(curl_sys::CURLOPT_PROXY, proxy.into())
+                .with_easy_context("setopt CURLOPT_PROXY")
+        }
+    }
+
+    pub fn set_http_proxy_tunnel(
+        self: Pin<&mut Self>,
+        tunnel: bool,
+    ) -> Result<(), CurlCodeContext> {
+        unsafe {
+            self.setopt_long(curl_sys::CURLOPT_HTTPPROXYTUNNEL, tunnel as c_long)
+                .with_easy_context("setopt CURLOPT_HTTPPROXYTUNNEL")
+        }
+    }
+
+    pub fn set_suppress_connect_headers(
+        self: Pin<&mut Self>,
+        suppress: bool,
+    ) -> Result<(), CurlCodeContext> {
+        unsafe {
+            self.setopt_long(CURLOPT_SUPPRESS_CONNECT_HEADERS, suppress as c_long)
+                .with_easy_context("setopt CURLOPT_SUPPRESS_CONNECT_HEADERS")
+        }
+    }
+
     pub fn set_useragent<'s>(
         self: Pin<&mut Self>,
         user_agent: impl Into<Cow<'s, str>>,

backends/curl/src/request.rs

@@ -1,6 +1,7 @@
 use std::ops::{Deref, DerefMut};
 use std::pin::Pin;
 
+use nyquest_interface::client::ProxyOptions;
 use nyquest_interface::{Body, Method, Request, Result as NyquestResult};
 
 use crate::curl_ng::CurlCodeContext;
@@ -36,7 +37,7 @@ pub fn create_easy<C: EasyCallback>(callback: C, share: &Share) -> NyquestResult
 pub fn populate_request<S, C: EasyCallback, R: MimePartReader + Send + 'static>(
     url: &str,
     mut req: Request<S>,
-    options: &nyquest_interface::client::ClientOptions,
+    options: &nyquest_interface::client::ClientOptions, // FIXME: strings in options are copied to be null-terminated. Can we avoid that?
     easy: Pin<&mut EasyHandle<C>>,
     populate_stream: impl FnOnce(Pin<&mut EasyHandle<C>>, S) -> Result<(), CurlCodeContext>,
     #[cfg_attr(not(feature = "multipart"), allow(unused, unused_mut))]
@@ -45,8 +46,25 @@ pub fn populate_request<S, C: EasyCallback, R: MimePartReader + Send + 'static>(
     let mut headers = CurlStringList::default();
     easy.with_error_message(|mut e| {
         let mut raw = e.as_mut().as_raw_easy_mut();
-        if !options.use_default_proxy {
-            raw.as_mut().set_noproxy("*")?;
+        match &options.proxy_options {
+            ProxyOptions::Default => {}
+            ProxyOptions::None => raw.as_mut().set_noproxy("*")?,
+            ProxyOptions::Custom {
+                proxy_url_for_http,
+                proxy_url_for_https,
+                proxy_bypass,
+            } => {
+                raw.as_mut().set_proxy(&**proxy_url_for_http)?;
+                if proxy_url_for_https.is_some() {
+                    // TODO: curl doesn't have a separate option for HTTPS proxy.
+                    raw.as_mut().set_http_proxy_tunnel(true)?;
+                    raw.as_mut().set_suppress_connect_headers(true)?;
+                }
+
+                if let Some(proxy_bypass) = proxy_bypass {
+                    raw.as_mut().set_noproxy(&**proxy_bypass)?;
+                }
+            }
         }
         if let Some(user_agent) = options.user_agent.as_deref() {
             raw.as_mut().set_useragent(user_agent)?;

backends/nsurlsession/Cargo.toml

@@ -30,14 +30,15 @@ cfg-if.workspace = true
 [target.'cfg(target_vendor = "apple")'.dependencies]
 block2 = { version = "0.6", default-features = false }
 objc2 = { version = "0.6", default-features = false }
-objc2-foundation = { version = "0.3", default-features = false, features = [
+objc2-foundation = { version = "0.3.2", default-features = false, features = [
     "alloc",
     "block2",
     "NSError",
     "NSObject",
     "NSCharacterSet",
     "NSArray",
     "NSString",
+    "NSValue",
     "NSData",
     "NSDate",
     "NSURL",

backends/nsurlsession/src/async.rs

@@ -51,9 +51,7 @@ impl AsyncResponse for NSUrlSessionAsyncResponse {
             .set_max_response_buffer_size(self.max_response_buffer_size);
         let inner = &mut self.inner;
         let inner_waker = coerce_waker(inner.shared.waker_ref());
-        unsafe {
-            inner.task.resume();
-        }
+        inner.task.resume();
         poll_fn(|cx| {
             if inner.shared.is_completed() {
                 return Poll::Ready(());
@@ -63,9 +61,7 @@ impl AsyncResponse for NSUrlSessionAsyncResponse {
         })
         .await;
         let res = inner.shared.take_response_buffer()?;
-        unsafe {
-            inner.task.error().into_nyquest_result()?;
-        }
+        inner.task.error().into_nyquest_result()?;
         Ok(res)
     }
 }
@@ -85,9 +81,7 @@ impl nyquest_interface::r#async::futures_io::AsyncRead for NSUrlSessionAsyncResp
 
         let inner_waker = coerce_waker(inner.shared.waker_ref());
         inner_waker.register(cx);
-        unsafe {
-            inner.task.resume();
-        }
+        inner.task.resume();
         Poll::Pending
     }
 }
@@ -115,7 +109,7 @@ impl AsyncClient for NSUrlSessionAsyncClient {
                 unreachable!("async-stream feature is disabled")
             }
         })?;
-        let shared = unsafe {
+        let shared = {
             let delegate = DataTaskDelegate::new(waker, self.inner.allow_redirects);
             task.setDelegate(Some(ProtocolObject::from_ref(&*delegate)));
             task.resume();
@@ -140,9 +134,7 @@ impl AsyncClient for NSUrlSessionAsyncClient {
             Poll::Pending
         })
         .await?;
-        unsafe {
-            task.error().into_nyquest_result()?;
-        }
+        task.error().into_nyquest_result()?;
         Ok(NSUrlSessionAsyncResponse {
             inner: NSUrlSessionResponse {
                 task,