Remove futures-util and apply notes from code review

Co-authored-by: Yoshua Wuyts <[email protected]>

Author: Perseus101

Cargo.toml

@@ -42,7 +42,6 @@ isahc = { version = "0.9", optional = true, default-features = false, features =
 js-sys = { version = "0.3.25", optional = true }
 wasm-bindgen = { version = "0.2.48", optional = true }
 wasm-bindgen-futures = { version = "0.4.5", optional = true }
-futures-util = "0.3.1"
 
 [target.'cfg(target_arch = "wasm32")'.dependencies.web-sys]
 version = "0.3.25"

src/wasm.rs

@@ -43,10 +43,7 @@ impl HttpClient for WasmClient {
             response.set_body(Body::from(body));
             for (name, value) in res.headers() {
                 let name: http_types::headers::HeaderName = name.parse().unwrap();
-                response.insert_header(
-                    &name,
-                    value.parse::<http_types::headers::HeaderValue>().unwrap(),
-                );
+                response.insert_header(&name, value);
             }
 
             Ok(response)
@@ -76,7 +73,6 @@ impl Future for InnerFuture {
 }
 
 mod fetch {
-    use futures_util::io::AsyncReadExt;
     use js_sys::{Array, ArrayBuffer, Reflect, Uint8Array};
     use wasm_bindgen::JsCast;
     use wasm_bindgen_futures::JsFuture;
@@ -91,35 +87,34 @@ mod fetch {
     /// An HTTP Fetch Request.
     pub(crate) struct Request {
         request: web_sys::Request,
-        _body_buf: Pin<Vec<u8>>,
+        /// This field stores the body of the request to ensure it stays allocated as long as the request needs it.
+        #[allow(dead_code)]
+        body_buf: Pin<Vec<u8>>,
     }
 
     impl Request {
         /// Create a new instance.
         pub(crate) async fn new(mut req: super::Request) -> Result<Self, io::Error> {
-            //create a fetch request initaliser
+            // create a fetch request initaliser
             let mut init = RequestInit::new();
 
-            //set the fetch method
+            // set the fetch method
             init.method(req.method().as_ref());
 
             let uri = req.url().to_string();
-            let mut body = req.take_body();
+            let body = req.take_body();
 
-            //convert the body into a uint8 array
+            // convert the body into a uint8 array
             // needs to be pinned and retained inside the Request because the Uint8Array passed to
             // js is just a portal into WASM linear memory, and if the underlying data is moved the
             // js ref will become silently invalid
-            let mut body_buf = Vec::with_capacity(1024);
-            body.read_to_end(&mut body_buf).await.map_err(|_| {
+            let body_buf = body.into_bytes().await.map_err(|_| {
                 io::Error::new(io::ErrorKind::Other, "could not read body into a buffer")
             })?;
             let body_pinned = Pin::new(body_buf);
             if body_pinned.len() > 0 {
-                unsafe {
-                    let uint_8_array = js_sys::Uint8Array::view(&body_pinned);
-                    init.body(Some(&uint_8_array));
-                }
+                let uint_8_array = unsafe { js_sys::Uint8Array::view(&body_pinned) };
+                init.body(Some(&uint_8_array));
             }
 
             let request = web_sys::Request::new_with_str_and_init(&uri, &init).map_err(|e| {
@@ -129,7 +124,7 @@ mod fetch {
                 )
             })?;
 
-            //add any fetch headers
+            // add any fetch headers
             let headers: &mut super::Headers = req.as_mut();
             for (name, value) in headers.iter() {
                 let name = name.as_str();
@@ -145,7 +140,7 @@ mod fetch {
 
             Ok(Self {
                 request,
-                _body_buf: body_pinned,
+                body_buf: body_pinned,
             })
         }