provide get_proxy function

lib/cli/src/commands/package/download.rs

@@ -6,7 +6,7 @@ use indicatif::{ProgressBar, ProgressStyle};
 use tempfile::NamedTempFile;
 use wasmer_config::package::{PackageIdent, PackageSource};
 use wasmer_registry::wasmer_env::WasmerEnv;
-use wasmer_wasix::http::reqwest::client_blocking_builder;
+use wasmer_wasix::http::reqwest::get_proxy;
 
 /// Download a package from the registry.
 #[derive(clap::Parser, Debug)]
@@ -139,9 +139,14 @@ impl PackageDownload {
             PackageSource::Url(url) => bail!("cannot download a package from a URL: '{}'", url),
         };
 
-        let client = client_blocking_builder()?
-            .build()
-            .context("failed to create reqwest client")?;
+        let builder = {
+            let mut builder = reqwest::blocking::ClientBuilder::new();
+            if let Some(proxy) = get_proxy()? {
+                builder = builder.proxy(proxy);
+            }
+            builder
+        };
+        let client = builder.build().context("failed to create reqwest client")?;
 
         let mut b = client
             .get(download_url)

lib/wasix/src/http/reqwest.rs

@@ -44,7 +44,11 @@ impl ReqwestHttpClient {
         // TODO: use persistent client?
         let builder = {
             let _guard = Handle::try_current().map_err(|_| self.handle.enter());
-            client_builder()?.connect_timeout(self.connect_timeout)
+            let mut builder = reqwest::ClientBuilder::new().connect_timeout(self.connect_timeout);
+            if let Some(proxy) = get_proxy()? {
+                builder = builder.proxy(proxy);
+            }
+            builder
         };
         let client = builder.build().context("failed to create reqwest client")?;
 
@@ -93,24 +97,12 @@ impl super::HttpClient for ReqwestHttpClient {
     }
 }
 
-pub fn client_builder() -> Result<reqwest::ClientBuilder, anyhow::Error> {
-    let mut builder = reqwest::Client::builder();
+pub fn get_proxy() -> Result<Option<reqwest::Proxy>, anyhow::Error> {
+    if let Ok(scheme) = env::var("http_proxy").or_else(|_| env::var("HTTP_PROXY")) {
+        let proxy = reqwest::Proxy::all(scheme)?;
 
-    let proxy = env::var("http_proxy").or_else(|_| env::var("HTTP_PROXY"));
-    if let Ok(scheme) = proxy {
-        builder = builder.proxy(reqwest::Proxy::all(scheme)?);
+        Ok(Some(proxy))
+    } else {
+        Ok(None)
     }
-
-    Ok(builder)
-}
-
-pub fn client_blocking_builder() -> Result<reqwest::blocking::ClientBuilder, anyhow::Error> {
-    let mut builder = reqwest::blocking::Client::builder();
-
-    let proxy = env::var("http_proxy").or_else(|_| env::var("HTTP_PROXY"));
-    if let Ok(scheme) = proxy {
-        builder = builder.proxy(reqwest::Proxy::all(scheme)?);
-    }
-
-    Ok(builder)
 }