Added Vite bundler support, Channels & Async functions

.gitignore

@@ -6,3 +6,4 @@ test-results/
 playwright-report/
 blob-report/
 playwright/.cache/
+.DS_Store

Cargo.toml

@@ -11,7 +11,7 @@ readme = "README.md"
 keywords = ["webworker", "parallelism", "wasm"]
 
 [workspace.dependencies]
-wasmworker = { version = "0.1", path = ".", features = ["serde"]}
+wasmworker = { version = "0.1", path = ".", features = ["serde"] }
 wasmworker-proc-macro = { version = "0.1", path = "proc-macro" }
 
 [package]
@@ -30,7 +30,7 @@ keywords.workspace = true
 [dependencies]
 futures = "0.3"
 js-sys = { version = "0.3" }
-postcard = { version = "1.0", features = ["alloc"] }
+pot = "3.0"
 send_wrapper = "0.6"
 serde = { version = "1.0", features = ["derive"] }
 serde_bytes = "0.11"
@@ -39,6 +39,7 @@ thiserror = "2.0"
 tokio = { version = "1.4", features = ["sync"] }
 wasm-bindgen = "0.2"
 wasm-bindgen-futures = "0.4"
+log = "*"
 
 [dependencies.web-sys]
 features = [
@@ -52,6 +53,9 @@ features = [
     "BlobPropertyBag",
     "Url",
     "Navigator",
+    "MessagePort",
+    "MessageChannel",
+    "Response",
 ]
 version = "0.3"
 

demo/src/lib.rs

@@ -23,7 +23,7 @@ async fn worker() -> &'static WebWorker {
     WORKER
         .get_or_init(move || async {
             SendWrapper::new(
-                WebWorker::with_path(None, None)
+                WebWorker::with_path(None, None, None)
                     .await
                     .expect_throw("Couldn't instantiate WebWorker"),
             )

proc-macro/Cargo.toml

@@ -17,3 +17,4 @@ proc-macro = true
 [dependencies]
 syn = { version = "2.0", features = ["full", "extra-traits"] }
 quote = "1.0"
+log = "*"

proc-macro/src/lib.rs

@@ -4,24 +4,48 @@
 
 use proc_macro::TokenStream;
 use quote::{format_ident, quote};
-use syn::{parse_macro_input, ItemFn};
+use syn::{parse_macro_input, token::Async, ItemFn};
 
 /// A procedural macro that exports a function for use with a webworker.
 #[proc_macro_attribute]
 pub fn webworker_fn(_attr: TokenStream, item: TokenStream) -> TokenStream {
-    let input = parse_macro_input!(item as ItemFn);
+    let mut input = parse_macro_input!(item as ItemFn);
     let fn_name = &input.sig.ident;
 
+    // make the input function always async
+    input.sig.asyncness = Some(Async::default());
+
+    // the core function should have 2 inputs always
+    let output = if input.sig.inputs.len() == 1 {
+        let func_vis = &input.vis; // like pub
+        let func_block = &input.block; // { some statement or expression here }
+        let func_name = &input.sig.ident; // function nameinput
+        let func_generics = &input.sig.generics;
+        let func_inputs = &input.sig.inputs;
+        let func_output = &input.sig.output;
+        quote! {
+            #func_vis async fn #func_name #func_generics(#func_inputs, channel: Option<wasmworker::Channel>) #func_output {
+                #func_block
+            }
+        }
+    } else {
+        quote! {
+            #input
+        }
+    };
+
     // Generate a module with the wrapper function
     let wrapper_fn_name = format_ident!("__webworker_{}", fn_name);
     let mod_code = quote! {
         pub mod #fn_name {
             pub const __WEBWORKER: () = ();
             const _: () = {
                 #[wasm_bindgen::prelude::wasm_bindgen]
-                pub fn #wrapper_fn_name(arg: Box<[u8]>) -> Box<[u8]> {
+                pub async fn #wrapper_fn_name(arg: Box<[u8]>, port: wasm_bindgen::JsValue) -> Box<[u8]> {
+                    use wasm_bindgen::JsCast;
                     let arg = wasmworker::convert::from_bytes(&arg);
-                    let res = super::#fn_name(arg);
+                    let channel = port.dyn_into::<wasmworker::MessagePort>().ok().map(wasmworker::Channel::from);
+                    let res = super::#fn_name(arg, channel).await;
                     let res = wasmworker::convert::to_bytes(&res);
                     res
                 }
@@ -31,7 +55,7 @@ pub fn webworker_fn(_attr: TokenStream, item: TokenStream) -> TokenStream {
 
     // Combine everything into the final output
     let expanded = quote! {
-        #input
+        #output
 
         #mod_code
     };