Introduce a WebHttpClient

wasmerio · Aug 10, 2023 · 498fce9 · 498fce9
1 parent 4821a56
commit 498fce9
Show file tree

Hide file tree

Showing 10 changed files with 325 additions and 21 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/lib/wasi-types/Cargo.toml b/lib/wasi-types/Cargo.toml
@@ -29,7 +29,7 @@ bitflags = "1.3.0"
 cfg-if = "1.0.0"
 anyhow = "1.0.66"
 byteorder = "1.3"
-time = "0.2"
+time = "0.3"
 tracing = { version = "0.1.37" }
 
 [dev-dependencies.pretty_assertions]

diff --git a/lib/wasix/Cargo.toml b/lib/wasix/Cargo.toml
@@ -68,6 +68,9 @@ url = "2.3.1"
 petgraph = "0.6.3"
 rayon = { version = "1.7.0", optional = true }
 wasm-bindgen = { version = "0.2.87", optional = true }
+js-sys = { version = "0.3.64", optional = true }
+wasm-bindgen-futures = { version = "0.4.37", optional = true }
+web-sys = { version = "0.3.64", features = ["Request", "RequestInit", "Window", "WorkerGlobalScope", "RequestMode", "Response", "Headers"], optional = true }
 
 [target.'cfg(not(target_arch = "riscv64"))'.dependencies.reqwest]
 version = "0.11"
@@ -94,6 +97,7 @@ winapi = "0.3"
 wasmer = { path = "../api", version = "=4.1.0", default-features = false, features = ["wat", "js-serializable-module"] }
 tokio = { version = "1", features = [ "sync", "macros", "rt" ], default_features = false }
 pretty_assertions = "1.3.0"
+wasm-bindgen-test = "0.3.0"
 
 [target.'cfg(target_arch = "wasm32")'.dev-dependencies]
 wasm-bindgen-test = "0.3.0"
@@ -111,15 +115,15 @@ time = ["tokio/time"]
 webc_runner_rt_wcgi = ["hyper", "wcgi", "wcgi-host", "tower", "tower-http"]
 webc_runner_rt_emscripten = ["wasmer-emscripten"]
 
-sys = ["webc/mmap", "time"]
+sys = ["webc/mmap", "time", "virtual-mio/sys"]
 sys-default = ["sys", "logging", "host-fs", "sys-poll", "sys-thread", "host-vnet", "host-threads", "host-reqwest"]
 sys-poll = []
 sys-thread = ["tokio/rt", "tokio/time", "tokio/rt-multi-thread", "rayon"]
 
 # Deprecated. Kept it for compatibility
 compiler = []
 
-js = ["virtual-fs/no-time", "getrandom/js", "chrono"]
+js = ["virtual-fs/no-time", "getrandom/js", "chrono", "js-sys", "wasm-bindgen", "wasm-bindgen-futures", "web-sys"]
 js-default = ["js"]
 test-js = ["js", "wasmer/wat"]
 

diff --git a/lib/wasix/src/http/client.rs b/lib/wasix/src/http/client.rs
@@ -138,7 +138,6 @@ impl From<http::Request<()>> for HttpRequest {
     }
 }
 
-
 // TODO: use types from http crate?
 pub struct HttpResponse {
     pub body: Option<Vec<u8>>,

diff --git a/lib/wasix/src/http/mod.rs b/lib/wasix/src/http/mod.rs
@@ -4,7 +4,10 @@ pub mod client_impl;
 #[cfg(feature = "host-reqwest")]
 pub mod reqwest;
 
-pub use self::client::*;
+#[cfg(feature = "js")]
+mod web_http_client;
+
+pub use self::{client::*, web_http_client::WebHttpClient};
 
 pub(crate) const USER_AGENT: &str = concat!(env!("CARGO_PKG_NAME"), "-", env!("CARGO_PKG_VERSION"));
 
@@ -13,6 +16,8 @@ pub fn default_http_client() -> Option<impl HttpClient + Send + Sync + 'static>
     cfg_if::cfg_if! {
         if #[cfg(feature = "host-reqwest")] {
             Some(self::reqwest::ReqwestHttpClient::default())
+        } else if #[cfg(feature = "js")] {
+            Some(web_http_client::WebHttpClient::default())
         } else {
             // Note: We need something to use with turbofish otherwise returning
             // a plain None will complain about not being able to infer the "T"
-Original file line number
+Diff line change
@@ Expand Up / @@ -138,7 +138,6 @@ impl From<http::Request<()>> for HttpRequest { @@
         }
     }
     // TODO: use types from http crate?
     pub struct HttpResponse {
         pub body: Option<Vec<u8>>,
@@ Expand Down @@