@remix_labs/machine-starter 2.11935.0-dev → 2.11939.0-dev

package/common.js

@@ -117,7 +117,7 @@ globalThis.MixSetMask = (m => {
     }
 });
 
-function StartWASM(hub, baseURL, org, workspace, vmID, user, token, noOutputViaMQTT, getWorker) {
+function StartWASM(hub, baseURL, org, workspace, vmID, user, token, noOutputViaMQTT) {
     return StartWASM2(hub, {
         baseURL: baseURL,
         org: org,
@@ -125,17 +125,17 @@ function StartWASM(hub, baseURL, org, workspace, vmID, user, token, noOutputViaM
         token: token,
         noOutputViaMQTT: noOutputViaMQTT,
         machType: "WASM"
-    }, getWorker)
+    })
 }
 
-async function StartWASM2(hub, config, getWorker) {
+async function StartWASM2(hub, config) {
     if (!last_hub) {
         console.log("[machine-starter] Call MixExplain() for explaining debug levels, and MixSetMask(m) for changing these")
     };
     last_hub = hub;
     let channel = await hub.newChannel();
     // injected by either index.js or node.js
-    let worker = getWorker();
+    let worker = globalThis.GetMachineWASMWorker();
     if (workers[config.vmID] || ffiLoops[config.vmID])
         throw new Error("Cannot start VM, the ID is used: " + config.vmID);
     workers[config.vmID] = worker;
@@ -163,7 +163,7 @@ async function StartWASM2(hub, config, getWorker) {
     };
     let vm_kind = { isRaw:false, canFail:false, useJsonDecoder:false};
     starterFFIkind["$vm_start"] = vm_kind;
-    starterFFIfuns["$vm_start"] = (conn, args) => ffi_vm_start(conn, args, getWorker);
+    starterFFIfuns["$vm_start"] = ffi_vm_start;
     starterFFIkind["$vm_stop"] = vm_kind;
     starterFFIfuns["$vm_stop"] = ffi_vm_stop;
     let mixrtCode = config.mixrtCode;
@@ -218,7 +218,7 @@ async function mixcoreStarterFFIs(mixcore) {
     return ffis;
 }
 
-async function ffi_vm_start(conn, args, getWorker) {
+async function ffi_vm_start(conn, args) {
     let vm_id = "embedded." + nanoid();
     console.log("[machine-starter] starting VM: ", vm_id);
     let config = {};
@@ -234,7 +234,7 @@ async function ffi_vm_start(conn, args, getWorker) {
         config["interceptFFI"] = arg_config.interceptFFI;
     if (arg_config.interceptDynloadFFI !== undefined)
         config["interceptDynloadFFI"] = arg_config.interceptDynloadFFI;
-    let worker = await StartWASM2(conn.hub, config, getWorker);
+    let worker = await StartWASM2(conn.hub, config);
     return vm_id;
 }
 

package/groovebox_build.js

@@ -1,2 +1,2 @@
-var GROOVEBOX_BUILD = "11935";
+var GROOVEBOX_BUILD = "11939";
 export { GROOVEBOX_BUILD }

package/index.js

@@ -1 +1,12 @@
+import MachineWASMWorker from './machine-wasm.worker.mjs'
+
+const blob = new Blob([MachineWASMWorker], {type: 'application/javascript'});
+const url = URL.createObjectURL(blob);
+
+function GetMachineWASMWorker() {
+    return new Worker(url);
+}
+
+globalThis.GetMachineWASMWorker = GetMachineWASMWorker;
+
 export * from './common.js';

package/node.js

@@ -5,6 +5,26 @@ 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.11935.0-dev",
+  "version": "2.11939.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.11935.0-dev",
+    "@remix_labs/hub-client": "2.11939.0-dev",
     "nanoid": "^5.0.2",
     "web-worker": "^1.2.0"
   },

package/start.js

@@ -1,8 +1,6 @@
 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);
@@ -50,25 +48,6 @@ 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," + encodeURIComponent(MachineWASMWorkerString);
-let getMachineWorker = () => new Worker(workerUrl);
-
 w.configure({wsURL: mqttURL, user:mqttUser, token:mqttToken}).then(resp => {
     if (variant == "BYTE") variant = "QCODE";
     switch(variant) {
@@ -88,7 +67,7 @@ w.configure({wsURL: mqttURL, user:mqttUser, token:mqttToken}).then(resp => {
                 machType: variant,
                 localFFIs: {},
                 mixcore,
-            }, getMachineWorker);
+            });
         });
         if (globalThis.EnableAndStartMixCompiler) {
             EnableAndStartMixCompiler(w).then(startVM);