Merge pull request #15 from matklad/content-length

Set Content-Length if we can

Author: yoshuawuyts

src/isahc.rs

@@ -42,7 +42,10 @@ impl HttpClient for IsahcClient {
         let client = self.client.clone();
         Box::pin(async move {
             let (parts, body) = req.into_parts();
-            let body = isahc::Body::reader(body);
+            let body = match body.len {
+                Some(len) => isahc::Body::reader_sized(body, len),
+                None => isahc::Body::reader(body),
+            };
             let req: http::Request<isahc::Body> = http::Request::from_parts(parts, body);
 
             let res = client.send_async(req).await?;

src/lib.rs

@@ -70,20 +70,26 @@ pub trait HttpClient: Debug + Unpin + Send + Sync + Clone + 'static {
 /// like `Vec<u8>` or `String`, using the `From` trait.
 pub struct Body {
     reader: Box<dyn AsyncRead + Unpin + Send + 'static>,
+    /// Intentionally use `u64` over `usize` here.
+    /// `usize` won't work if you try to send 10GB file from 32bit host.
+    #[allow(dead_code)] // not all backends make use of this
+    len: Option<u64>,
 }
 
 impl Body {
     /// Create a new empty body.
     pub fn empty() -> Self {
         Self {
             reader: Box::new(futures::io::empty()),
+            len: Some(0),
         }
     }
 
     /// Create a new instance from a reader.
     pub fn from_reader(reader: impl AsyncRead + Unpin + Send + 'static) -> Self {
         Self {
             reader: Box::new(reader),
+            len: None,
         }
     }
 }
@@ -110,8 +116,10 @@ impl From<Vec<u8>> for Body {
     #[allow(missing_doc_code_examples)]
     #[inline]
     fn from(vec: Vec<u8>) -> Body {
+        let len = vec.len() as u64;
         Self {
             reader: Box::new(Cursor::new(vec)),
+            len: Some(len),
         }
     }
 }
@@ -120,6 +128,6 @@ impl<R: AsyncRead + Unpin + Send + 'static> From<Box<R>> for Body {
     /// Converts an `AsyncRead` into a Body.
     #[allow(missing_doc_code_examples)]
     fn from(reader: Box<R>) -> Self {
-        Self { reader }
+        Self { reader, len: None }
     }
 }

src/wasm.rs

@@ -116,7 +116,7 @@ mod fetch {
             debug_assert!(resp.is_instance_of::<web_sys::Response>());
             let res: web_sys::Response = resp.dyn_into().unwrap();
 
-            // Get the request body.
+            // Get the response body.
             let promise = res.array_buffer().unwrap();
             let resp = JsFuture::from(promise).await.unwrap();
             debug_assert!(resp.is_instance_of::<js_sys::ArrayBuffer>());