0.4.0

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "reqwest-cross"
-version = "0.3.1"
+version = "0.4.0"
 authors = ["One <[email protected]>"]
 categories = ["web-programming::http-client", "wasm"]
 documentation = "https://docs.rs/reqwest-cross"
@@ -14,6 +14,7 @@ description = "Wrapper around reqwest for use in both native and wasm"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
+futures = "0.3.28"
 reqwest = { version = "0.12.3", default-features = false }
 
 # For native compilation
@@ -27,7 +28,6 @@ js-sys = { version = "0.3.69", optional = true }
 web-sys = { version = "0.3.69", optional = true }
 
 [dev-dependencies]
-futures = "0.3.28"
 reqwest = { version = "0.12.3" }
 wasm-bindgen-test = "0.3.34"
 

examples/loop_yield.rs

@@ -42,7 +42,7 @@ async fn common_code() -> Result<(), Box<dyn std::error::Error>> {
                 let (tx, rx) = futures::channel::oneshot::channel();
                 fetch(
                     request,
-                    move |result: Result<reqwest::Response, reqwest::Error>| {
+                    move |result: Result<reqwest::Response, reqwest::Error>| async {
                         tx.send(result.expect("Expecting Response not Error").status())
                             .expect("Receiver should still be available");
                     },

examples/simple_fetch.rs

@@ -26,7 +26,7 @@ async fn common_code() -> Result<(), Box<dyn std::error::Error>> {
 
     fetch(
         request,
-        move |result: Result<reqwest::Response, reqwest::Error>| {
+        move |result: Result<reqwest::Response, reqwest::Error>| async {
             tx.send(result.expect("Expecting Response not Error").status())
                 .expect("Receiver should still be available");
         },

src/lib.rs

@@ -3,6 +3,7 @@
 #![cfg_attr(docsrs, feature(doc_cfg))]
 #![forbid(unsafe_code)]
 #![cfg_attr(test, deny(warnings))]
+// dox - used as documentation for duplicate wasm functions (Uncertain if this will cause problems but seen this in Reqwest)
 
 //! # reqwest-cross
 //!

src/native.rs

@@ -4,12 +4,10 @@
 compile_error!("Must chose a native runtime by enabling a feature flag. Right now only tokio is supported. If you have a different runtime that you want please create an issue on github.");
 
 #[cfg(feature = "native-tokio")]
-pub fn fetch<F>(request: reqwest::RequestBuilder, on_done: F)
+pub fn spawn<F>(future: F)
 where
-    F: 'static + Send + FnOnce(Result<reqwest::Response, reqwest::Error>),
+    F: 'static + Send + futures::Future,
+    F::Output: Send + 'static,
 {
-    tokio::spawn(async move {
-        let result = request.send().await;
-        on_done(result)
-    });
+    tokio::spawn(future);
 }

src/wasm.rs

@@ -1,11 +1,8 @@
 //! Stores the code specific to wasm compilations
 
-pub fn fetch<F>(request: reqwest::RequestBuilder, on_done: F)
+pub fn spawn<F>(future: F)
 where
-    F: 'static + Send + FnOnce(reqwest::Result<reqwest::Response>),
+    F: futures::Future<Output = ()> + 'static,
 {
-    wasm_bindgen_futures::spawn_local(async move {
-        let result = request.send().await;
-        on_done(result)
-    });
+    wasm_bindgen_futures::spawn_local(future);
 }

src/wrappers.rs

@@ -1,6 +1,7 @@
 //! Stores the wrapper functions that can be called from either native or wasm
 //! code
 
+#[cfg(not(target_arch = "wasm32"))]
 /// Performs a HTTP requests and calls the given callback when done. NB: Needs
 /// to use a callback to prevent blocking on the thread that initiates the
 /// fetch. Note: Instead of calling get like in the example you can use post,
@@ -19,7 +20,7 @@
 ///  let request = client.get("http://httpbin.org/get");
 ///  let (tx, rx) = futures::channel::oneshot::channel();
 ///
-///  fetch(request, move |result: Result<reqwest::Response, reqwest::Error>| {
+///  fetch(request, move |result: Result<reqwest::Response, reqwest::Error>| async {
 ///      tx.send(result.expect("Expecting Response not Error").status())
 ///                .expect("Receiver should still be available");
 ///  });
@@ -32,15 +33,48 @@
 /// # #[cfg(target_arch = "wasm32")]
 /// # fn main(){}
 /// ```
-pub fn fetch<F>(request: reqwest::RequestBuilder, on_done: F)
+pub fn fetch<F, O>(request: reqwest::RequestBuilder, on_done: F)
 where
-    F: 'static + Send + FnOnce(reqwest::Result<reqwest::Response>),
+    F: 'static + Send + FnOnce(reqwest::Result<reqwest::Response>) -> O,
+    O: futures::Future<Output = ()> + Send,
 {
-    #[cfg(not(target_arch = "wasm32"))]
-    crate::native::fetch(request, on_done);
+    let future = async move {
+        let result = request.send().await;
+        on_done(result).await;
+    };
+    spawn(future);
+}
+
+/// dox
+#[cfg(target_arch = "wasm32")]
+pub fn fetch<F, O>(request: reqwest::RequestBuilder, on_done: F)
+where
+    F: 'static + FnOnce(reqwest::Result<reqwest::Response>) -> O,
+    O: futures::Future<Output = ()>,
+{
+    let future = async move {
+        let result = request.send().await;
+        on_done(result).await;
+    };
+    spawn(future);
+}
 
-    #[cfg(target_arch = "wasm32")]
-    crate::wasm::fetch(request, on_done);
+#[cfg(not(target_arch = "wasm32"))]
+/// Spawns a future on the underlying runtime in a cross platform way
+pub fn spawn<F>(future: F)
+where
+    F: futures::Future<Output = ()> + 'static + Send,
+{
+    crate::native::spawn(future);
+}
+
+#[cfg(target_arch = "wasm32")]
+/// dox
+pub fn spawn<F>(future: F)
+where
+    F: futures::Future<Output = ()> + 'static,
+{
+    crate::wasm::spawn(future);
 }
 
 // TODO 3: Test link in documentation after pushing to main

tests/web.rs

@@ -12,7 +12,7 @@ fn main() {
 
         fetch(
             request,
-            move |result: Result<reqwest::Response, reqwest::Error>| {
+            move |result: Result<reqwest::Response, reqwest::Error>| async {
                 tx.send(result.expect("Expecting Response not Error").status())
                     .expect("Receiver should still be available");
             },