@remix_labs/machine-starter 2.2833.0-dev → 2.2838.0-dev

package/common.js

@@ -4,15 +4,19 @@ import { MixcoreTauri, filterFFINames } from "./mixcore.lib.mjs";
 
 let workers = {};
 let children = {};
-let ffiSubscriptions = {};
+let ffiLoops = {};
 
 function terminateAll() {
     console.log("[groovebox-starter] terminate all VMs");
     for (let [vmID, worker] of Object.entries(workers)) {
         worker.terminate();
     };
+    for (let ffiLoop of Object.values(ffiLoops)) {
+        ffiLoop.terminate();
+    }
     workers = {};
     children = {};
+    ffiLoops = {};
 }
 
 function terminateVM(vmID) {
@@ -20,12 +24,12 @@ function terminateVM(vmID) {
     let worker = workers[vmID];
     if (worker) {
         let vmChildren = children[vmID];
-        let ffiSubscription = ffiSubscriptions[vmID];
+        let ffiLoop = ffiLoops[vmID];
         delete workers[vmID];
         delete children[vmID];
-        delete ffiSubscriptions[vmID];
+        delete ffiLoops[vmID];
         worker.terminate();
-        ffiSubscription.terminate();
+        ffiLoop.terminate();
         if (vmChildren) {
             for (let subID of vmChildren) {
                 terminateVM(subID)
@@ -68,7 +72,8 @@ async function StartWASM2(hub, config) {
     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);
+    if (workers[config.vmID] || ffiLoops[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);
@@ -93,6 +98,7 @@ async function StartWASM2(hub, config) {
     localFFIfuns["$vm_start"] = ffi_vm_start;
     localFFIkind["$vm_stop"] = vm_kind;
     localFFIfuns["$vm_stop"] = ffi_vm_stop;
+    ffiLoops[config.vmID] = setupLocalFFIs(hub, config, localFFIfuns);
     let config_msg =
         { "_rmx_type": "msg_vm_configure",
           "baseURL": config.baseURL,
@@ -115,7 +121,6 @@ async function StartWASM2(hub, config) {
           // (http, https, data)
         };
     worker.postMessage(config_msg, [ channel.port ]);
-    setupLocalFFIs(hub, config, localFFIfuns);
     return worker;
 }
 
@@ -261,13 +266,13 @@ function decode(val) {
     }
 }
 
-// set the ffiSubscription and spawn the messaging loop
+// spawn the messaging loop and return an object with a function to terminate
+// the loop `{terminate: () => void}`
 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
+    return {terminate: terminate.resolve};
 }
 
 async function localFFIsMessageLoop(hub, config, localFFIs, terminate) {

package/groovebox_build.js

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

package/package.json

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