create client builder functions

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

@@ -6,6 +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;
 
 /// Download a package from the registry.
 #[derive(clap::Parser, Debug)]
@@ -138,16 +139,9 @@ impl PackageDownload {
             PackageSource::Url(url) => bail!("cannot download a package from a URL: '{}'", url),
         };
 
-        let client = {
-            let mut builder = reqwest::blocking::ClientBuilder::new();
-
-            let proxy = std::env::var("http_proxy").or_else(|_| std::env::var("HTTP_PROXY"));
-            if let Ok(scheme) = proxy {
-                builder = builder.proxy(reqwest::Proxy::all(scheme)?);
-            }
-
-            builder.build().context("Could not create reqwest client")?
-        };
+        let client = client_blocking_builder()?
+            .build()
+            .context("failed to create reqwest client")?;
 
         let mut b = client
             .get(download_url)

lib/wasix/src/http/reqwest.rs

@@ -42,17 +42,11 @@ impl ReqwestHttpClient {
             .with_context(|| format!("Invalid http method {}", request.method))?;
 
         // TODO: use persistent client?
-        let client = {
+        let builder = {
             let _guard = Handle::try_current().map_err(|_| self.handle.enter());
-            let mut builder = reqwest::Client::builder().connect_timeout(self.connect_timeout);
-
-            let proxy = env::var("http_proxy").or_else(|_| env::var("HTTP_PROXY"));
-            if let Ok(scheme) = proxy {
-                builder = builder.proxy(reqwest::Proxy::all(scheme)?);
-            }
-
-            builder.build().context("Could not create reqwest client")?
+            client_builder()?.connect_timeout(self.connect_timeout)
         };
+        let client = builder.build().context("failed to create reqwest client")?;
 
         let mut builder = client.request(method, request.url.as_str());
         for (header, val) in &request.headers {
@@ -98,3 +92,25 @@ impl super::HttpClient for ReqwestHttpClient {
         Box::pin(f)
     }
 }
+
+pub fn client_builder() -> Result<reqwest::ClientBuilder, anyhow::Error> {
+    let mut builder = reqwest::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)
+}
+
+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)
+}