WASM: Add try_clone implementations to Request and RequestBuilder (#1286)

kjvalencik · web-flow · commit c4388fcff940 · 2021-06-14T10:36:56.000-07:00
Currently the wasm client does not implement `try_clone` on `Request` or `RequestBuilder` like the blocking and async clients.

This PR adds infallible `try_clone` implementations to the wasm client to improve the API parity.

*Note*: Even though these APIs are infallible on wasm (no streaming bodies), I chose to keep the API identical.
diff --git a/src/wasm/body.rs b/src/wasm/body.rs
@@ -17,6 +17,7 @@ pub struct Body {
     inner: Inner,
 }
 
+#[derive(Clone)]
 enum Inner {
     Bytes(Bytes),
     #[cfg(feature = "multipart")]
@@ -56,6 +57,12 @@ impl Body {
             Inner::Multipart(form) => form.is_empty(),
         }
     }
+
+    pub(crate) fn clone(&self) -> Body {
+        Self {
+            inner: self.inner.clone(),
+        }
+    }
 }
 
 impl From<Bytes> for Body {
diff --git a/src/wasm/request.rs b/src/wasm/request.rs
@@ -89,6 +89,21 @@ impl Request {
     pub fn body_mut(&mut self) -> &mut Option<Body> {
         &mut self.body
     }
+
+    /// Attempts to clone the `Request`.
+    ///
+    /// None is returned if a body is which can not be cloned. This method
+    /// currently always returns `Some`, but that may change in the future.
+    pub fn try_clone(&self) -> Option<Request> {
+        Some(Self {
+            method: self.method.clone(),
+            url: self.url.clone(),
+            headers: self.headers.clone(),
+            body: self.body.as_ref().map(|body| body.clone()),
+            cors: self.cors,
+            credentials: self.credentials.clone(),
+        })
+    }
 }
 
 impl RequestBuilder {
@@ -335,6 +350,36 @@ impl RequestBuilder {
         let req = self.request?;
         self.client.execute_request(req).await
     }
+
+    /// Attempt to clone the RequestBuilder.
+    ///
+    /// `None` is returned if the RequestBuilder can not be cloned. This method
+    /// currently always returns `Some`, but that may change in the future.
+    ///
+    /// # Examples
+    ///
+    /// ```no_run
+    /// # use reqwest::Error;
+    /// #
+    /// # fn run() -> Result<(), Error> {
+    /// let client = reqwest::Client::new();
+    /// let builder = client.post("http://httpbin.org/post")
+    ///     .body("from a &str!");
+    /// let clone = builder.try_clone();
+    /// assert!(clone.is_some());
+    /// # Ok(())
+    /// # }
+    /// ```
+    pub fn try_clone(&self) -> Option<RequestBuilder> {
+        self.request
+            .as_ref()
+            .ok()
+            .and_then(|req| req.try_clone())
+            .map(|req| RequestBuilder {
+                client: self.client.clone(),
+                request: Ok(req),
+            })
+    }
 }
 
 impl fmt::Debug for Request {

Original file line number	Diff line number	Diff line change
`@@ -17,6 +17,7 @@ pub struct Body {`
`17`	`17`	`inner: Inner,`
`18`	`18`	`}`
`19`	`19`
	`20`	`+#[derive(Clone)]`
`20`	`21`	`enum Inner {`
`21`	`22`	`Bytes(Bytes),`
`22`	`23`	`#[cfg(feature = "multipart")]`
`@@ -56,6 +57,12 @@ impl Body {`
`56`	`57`	`Inner::Multipart(form) => form.is_empty(),`
`57`	`58`	`}`
`58`	`59`	`}`
	`60`	`+`
	`61`	`+ pub(crate) fn clone(&self) -> Body {`
	`62`	`+ Self {`
	`63`	`+ inner: self.inner.clone(),`
	`64`	`+ }`
	`65`	`+ }`
`59`	`66`	`}`
`60`	`67`
`61`	`68`	`impl From<Bytes> for Body {`