@remix_labs/machine-starter 2.2830.0 → 2.2833.0-dev

package/common.js

@@ -4,8 +4,10 @@ import { MixcoreTauri, filterFFINames } from "./mixcore.lib.mjs";
 
 let workers = {};
 let children = {};
+let ffiSubscriptions = {};
 
 function terminateAll() {
+    console.log("[groovebox-starter] terminate all VMs");
     for (let [vmID, worker] of Object.entries(workers)) {
         worker.terminate();
     };
@@ -14,12 +16,16 @@ function terminateAll() {
 }
 
 function terminateVM(vmID) {
+    console.log("[groovebox-starter] terminate VM", vmID);
     let worker = workers[vmID];
     if (worker) {
         let vmChildren = children[vmID];
+        let ffiSubscription = ffiSubscriptions[vmID];
         delete workers[vmID];
         delete children[vmID];
+        delete ffiSubscriptions[vmID];
         worker.terminate();
+        ffiSubscription.terminate();
         if (vmChildren) {
             for (let subID of vmChildren) {
                 terminateVM(subID)
@@ -35,7 +41,7 @@ if (globalThis.Process) {
     })
 };
 
-let initialMask = 64 + 1024;   // default for web
+let initialMask = 1024;   // default for web
 
 globalThis.MixSetMask = (m => {
     initialMask = m;
@@ -58,14 +64,16 @@ function StartWASM(hub, baseURL, org, workspace, vmID, user, token, noOutputViaM
 }
 
 async function StartWASM2(hub, config) {
-    console.log("GROOVEBOX_BUILD (machine-starter)", GROOVEBOX_BUILD);
+    console.log("[groovebox-starter] start VM", GROOVEBOX_BUILD, config.vmID, config.mixcore);
     let channel = await hub.newChannel();
     // injected by either index.js or node.js
     let worker = globalThis.GetMachineWASMWorker();
+    if (workers[config.vmID]) throw new Error("Cannot start VM, the ID is used: " + config.vmID);
     workers[config.vmID] = worker;
     let localFFIs = config.localFFIs || {};
     let mixcoreFFIs = await getMixcoreFFIs(config.mixcore);
     if (mixcoreFFIs) {
+        console.log("[groovebox-starter] mixcore FFIs", Object.keys(mixcoreFFIs));
         Object.assign(localFFIs, mixcoreFFIs);
         delete config.mixcore;
     }
@@ -107,7 +115,7 @@ async function StartWASM2(hub, config) {
           // (http, https, data)
         };
     worker.postMessage(config_msg, [ channel.port ]);
-    setupLocalFFIs(hub, config, localFFIfuns);  // don't await!
+    setupLocalFFIs(hub, config, localFFIfuns);
     return worker;
 }
 
@@ -253,7 +261,16 @@ function decode(val) {
     }
 }
 
-async function setupLocalFFIs(hub, config, localFFIs) {
+// set the ffiSubscription and spawn the messaging loop
+function setupLocalFFIs(hub, config, localFFIs) {
+    let vmID = config.vmID;
+    let terminate = Promise.withResolvers();
+    if (ffiSubscriptions[vmID]) ffiSubscriptions[vmID].terminate();
+    ffiSubscriptions[vmID] = {terminate: terminate.resolve};
+    localFFIsMessageLoop(hub, config, localFFIs, terminate.promise); // don't wait
+}
+
+async function localFFIsMessageLoop(hub, config, localFFIs, terminate) {
     let vmID = config.vmID;
     let channel = await hub.newChannel();
     let comm = new FFIComm(vmID, hub, channel);
@@ -261,13 +278,21 @@ async function setupLocalFFIs(hub, config, localFFIs) {
     await channel.setLocalPubTopic("/local/" + vmID);
     let sub = await channel.subscribe("/local/" + vmID + "/ffi/call");
     while (true) {
-        let msg = await sub.next();
+        let {msg, terminated} = await Promise.race([
+            sub.next().then((msg) => ({msg})),
+            terminate.then(() => ({terminated: true})),
+        ]);
+        if (terminated) {
+            console.log("[groovebox-starter] terminate FFI loop", vmID);
+            return;
+        }
         let name = msg.payload.name;
         let call_id = msg.payload.call_id;
         let args = decode(msg.payload.args);
         let fun = localFFIs[name];
+        console.log("[groovebox-starter] local FFI call", vmID, call_id, name);
         try {
-            if (!fun) throw new Error("no such local FFI: " + name);
+            if (!fun) throw new Error("No such local FFI in groovebox starter: " + name);
             let connector =
                 { call_id: call_id,
                   hub: hub,
@@ -373,8 +398,7 @@ async function getMixcoreFFIs(config) {
     return localFFIs;
 }
 
-// use worker.terminate() to shut a worker down!
-
+// use terminateVM to shut a worker down!
 export { StartWASM, StartWASM2, terminateAll, terminateVM,
          Token, Case, Opaque
        }

package/groovebox_build.js

@@ -1,2 +1,2 @@
-var GROOVEBOX_BUILD = "3109";
+var GROOVEBOX_BUILD = "3114";
 export { GROOVEBOX_BUILD }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@remix_labs/machine-starter",
-  "version": "2.2830.0",
+  "version": "2.2833.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.2830.0",
+    "@remix_labs/hub-client": "2.2833.0-dev",
     "nanoid": "^5.0.2",
     "web-worker": "^1.2.0"
   },