postMessage support

Cargo.toml

@@ -12,13 +12,10 @@ keywords = ["thread", "wasm", "parallel", "concurrency"]
 categories = ["concurrency", "wasm"]
 readme = "README.md"
 
-[features]
-default = ["es_modules"]
-es_modules = []
-
 [dependencies]
 wasm-bindgen = "0.2"
-web-sys = { version = "0.3", features = [
+wasm-bindgen-futures = "0.4"
+web-sys = { version = "0.3.70", features = [
     "Blob",
     "DedicatedWorkerGlobalScope",
     "MessageEvent",
@@ -38,7 +35,6 @@ log = "0.4"
 env_logger = "0.10"
 wasm-bindgen-test = "0.3"
 async-channel = "2.2"
-wasm-bindgen-futures = "0.4"
 
 [target.'cfg(target_arch = "wasm32")'.dev-dependencies]
 console_log = { version = "1.0", features = ["color"] }

examples-wasm-pack/web-build.sh

@@ -1,3 +1,3 @@
 #!/bin/sh
 
-wasm-pack build --dev --out-dir ./module/target --target web --features wasm_thread/es_modules
+wasm-pack build --dev --out-dir ./module/target --target web

src/wasm32/js/web_worker_module.js

@@ -1,27 +1,28 @@
-// synchronously, using the browser, import wasm_bindgen shim JS scripts
-import init, {wasm_thread_entry_point} from "WASM_BINDGEN_SHIM_URL";
-
 // Wait for the main thread to send us the shared module/memory and work context.
 // Once we've got it, initialize it all with the `wasm_bindgen` global we imported via
 // `importScripts`.
 self.onmessage = event => {
-    let [ module, memory, work ] = event.data;
+    let [ url, module, memory, work ] = event.data;
 
-    init(module, memory).catch(err => {
-        console.log(err);
+    (async () => {
+        try {
+            const wasm = await import(url);
+            wasm.initSync({ module, memory });
+            // Enter rust code by calling entry point defined in `lib.rs`.
+            // This executes closure defined by work context.
+            await wasm.wasm_thread_entry_point(work);
+        } catch (err) {
+            console.error(err);
 
-        // Propagate to main `onerror`:
-        setTimeout(() => {
+            // Propagate to main `onerror`:
+            setTimeout(() => {
+                throw err;
+            });
+            // Rethrow to keep promise rejected and prevent execution of further commands:
             throw err;
-        });
-        // Rethrow to keep promise rejected and prevent execution of further commands:
-        throw err;
-    }).then(() => {
-        // Enter rust code by calling entry point defined in `lib.rs`.
-        // This executes closure defined by work context.
-        wasm_thread_entry_point(work);
+        }
 
         // Once done, terminate web worker
         close();
-    });
-};
+    })();
+};