@remix_labs/machine-starter 2.11931.0-dev → 2.11933.0-dev

package/node.js

@@ -5,26 +5,6 @@ globalThis.console = new Console.Console({stdout: process.stderr, stderr: proces
 // redirect stdout to stderr to avoid that log messages appear in the wrong
 // order
 
-// NB: The only way I've made this work in node+webpack is if:
-//
-// * we use Worker from worker_threads directly
-// * we build each worker's module with webpack as an ESM .mjs bundle
-// * we put all the bundles in one directory
-// * we load the worker with a URL('./foo.mjs')
-//
-// Other ways to package/load might work, but definitely seems like
-// using worker_threads.Worker directly is needed (rather than through,
-// say, the web-worker packages that wraps either worker_threads.Worker
-// or the browser Worker to give the same interface). Webpack says ESM
-// is necessary but I'm not sure if this is true for either the main
-// script or the workers.
-import { Worker } from "worker_threads";
-
-function GetMachineWASMWorker() {
-    return new Worker(new URL("./machine-wasm.node.mjs", import.meta.url));
-}
-globalThis.GetMachineWASMWorker = GetMachineWASMWorker;
-
 // Can't just `export *` because we need hub-client below in common.js
 import * as Hub from "@remix_labs/hub-client";
 export { Hub };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@remix_labs/machine-starter",
-  "version": "2.11931.0-dev",
+  "version": "2.11933.0-dev",
   "description": "start the groove",
   "main": "node.js",
   "browser": "index.js",
@@ -11,7 +11,7 @@
   "author": "Remixlabs staff",
   "license": "ISC",
   "dependencies": {
-    "@remix_labs/hub-client": "2.11931.0-dev",
+    "@remix_labs/hub-client": "2.11933.0-dev",
     "nanoid": "^5.0.2",
     "web-worker": "^1.2.0"
   },

package/start.js

@@ -1,6 +1,8 @@
 import Process from "process";
+import { Worker } from "worker_threads";
 import { StartWASM2, Hub } from "./node.js";
 import { mixcoreWasmBase64, mixcoreJsBase64 } from './mixcore-wasm-inmem.js';
+import MachineWASMWorkerString from './machine-wasm.worker.mjs'
 
 if (Process.stdout._handle)
     Process.stdout._handle.setBlocking(true);
@@ -48,6 +50,25 @@ let mixcore = {
     dbName: "compiler-testing",
     createDbs: ["compiler-testing"],
 };
+
+// comment from start.js (before https://github.com/remixlabs/mix-rs/pull/1129):
+//
+// NB: The only way I've made this work in node+webpack is if:
+//
+// * we use Worker from worker_threads directly
+// * we build each worker's module with webpack as an ESM .mjs bundle
+// * we put all the bundles in one directory
+// * we load the worker with a URL('./foo.mjs')
+//
+// Other ways to package/load might work, but definitely seems like
+// using worker_threads.Worker directly is needed (rather than through,
+// say, the web-worker packages that wraps either worker_threads.Worker
+// or the browser Worker to give the same interface). Webpack says ESM
+// is necessary but I'm not sure if this is true for either the main
+// script or the workers.
+let workerUrl = "data:text/javascript;base64," + encodeURIComponent(MachineWASMWorkerString);
+let getMachineWorker = () => new Worker(workerUrl);
+
 w.configure({wsURL: mqttURL, user:mqttUser, token:mqttToken}).then(resp => {
     if (variant == "BYTE") variant = "QCODE";
     switch(variant) {
@@ -67,7 +88,7 @@ w.configure({wsURL: mqttURL, user:mqttUser, token:mqttToken}).then(resp => {
                 machType: variant,
                 localFFIs: {},
                 mixcore,
-            });
+            }, getMachineWorker);
         });
         if (globalThis.EnableAndStartMixCompiler) {
             EnableAndStartMixCompiler(w).then(startVM);