Update Multithreading example to use the new PackageToJS plugin

Author: kateinoigakukun

Examples/Multithreading/Sources/JavaScript/index.js

@@ -9,14 +9,12 @@ class ThreadRegistry {
   workers = new Map();
   nextTid = 1;
 
-  constructor({ configuration }) {
-    this.configuration = configuration;
-  }
+  constructor() {}
 
   spawnThread(worker, module, memory, startArg) {
     const tid = this.nextTid++;
     this.workers.set(tid, worker);
-    worker.postMessage({ module, memory, tid, startArg, configuration: this.configuration });
+    worker.postMessage({ module, memory, tid, startArg });
     return tid;
   }
 
@@ -39,8 +37,8 @@ class ThreadRegistry {
   }
 }
 
-async function start(configuration = "release") {
-  const response = await fetch(`./.build/${configuration}/MyApp.wasm`);
+async function start() {
+  const response = await fetch(`./.build/plugins/PackageToJS/outputs/Package/main.wasm`);
   const module = await WebAssembly.compileStreaming(response);
   const memoryImport = WebAssembly.Module.imports(module).find(i => i.module === "env" && i.name === "memory");
   if (!memoryImport) {
@@ -51,7 +49,7 @@ async function start(configuration = "release") {
   }
   const memoryType = memoryImport.type;
   const memory = new WebAssembly.Memory({ initial: memoryType.minimum, maximum: memoryType.maximum, shared: true });
-  const threads = new ThreadRegistry({ configuration });
+  const threads = new ThreadRegistry();
   const { instance, swiftRuntime, wasi } = await instantiate({
     module,
     threadChannel: threads,
@@ -63,8 +61,7 @@ async function start(configuration = "release") {
           return threads.spawnThread(worker, module, memory, startArg);
         }
       };
-    },
-    configuration
+    }
   });
   wasi.initialize(instance);
 

Examples/Multithreading/Sources/JavaScript/instantiate.js

@@ -1,6 +1,7 @@
 import { WASI, File, OpenFile, ConsoleStdout, PreopenDirectory } from 'https://esm.run/@bjorn3/browser_wasi_shim@0.3.0';
+import { SwiftRuntime } from "../../.build/plugins/PackageToJS/outputs/Package/runtime.js"
 
-export async function instantiate({ module, addToImports, threadChannel, configuration }) {
+export async function instantiate({ module, addToImports, threadChannel }) {
   const args = ["main.wasm"]
   const env = []
   const fds = [
@@ -15,7 +16,6 @@ export async function instantiate({ module, addToImports, threadChannel, configu
   ];
   const wasi = new WASI(args, env, fds);
 
-  const { SwiftRuntime } = await import(`/.build/${configuration}/JavaScriptKit_JavaScriptKit.resources/Runtime/index.mjs`);
   const swiftRuntime = new SwiftRuntime({ sharedMemory: true, threadChannel });
   const importObject = {
     wasi_snapshot_preview1: wasi.wasiImport,

Examples/Multithreading/Sources/JavaScript/worker.js

@@ -1,7 +1,7 @@
 import { instantiate } from "./instantiate.js"
 
 self.onmessage = async (event) => {
-  const { module, memory, tid, startArg, configuration } = event.data;
+  const { module, memory, tid, startArg } = event.data;
   const { instance, wasi, swiftRuntime } = await instantiate({
     module,
     threadChannel: {
@@ -18,8 +18,7 @@ self.onmessage = async (event) => {
       importObject["wasi"] = {
         "thread-spawn": () => { throw new Error("Cannot spawn a new thread from a worker thread"); }
       };
-    },
-    configuration
+    }
   });
 
   swiftRuntime.setInstance(instance);

Examples/Multithreading/build.sh

@@ -1 +1 @@
-swift build --swift-sdk DEVELOPMENT-SNAPSHOT-2024-07-09-a-wasm32-unknown-wasip1-threads -Xswiftc -Xclang-linker -Xswiftc -mexec-model=reactor -Xlinker --export=__main_argc_argv -c release -Xswiftc -g
+swift package --swift-sdk "${SWIFT_SDK_ID:-wasm32-unknown-wasip1-threads}" -c release js