@remix_labs/machine-starter 2.3275.0-dev → 2.3278.0-dev

package/common.js

@@ -123,31 +123,33 @@ async function StartWASM2(hub, config) {
     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 starterFFIs = config.localFFIs || {};
+    // from now on, the "local" FFIs are called "starter" FFIs, because this
+    // distinguishes these from other locally defined FFIs
     let mixcoreFFIs = await getMixcoreFFIs(config.mixcore);
     if (mixcoreFFIs) {
         console.log("[machine-starter] mixcore FFIs", Object.keys(mixcoreFFIs));
         // merge the ffis and store them back into the config so sub vms also get them
-        config.localFFIs = Object.assign(localFFIs, mixcoreFFIs);
+        config.localFFIs = Object.assign(starterFFIs, mixcoreFFIs);
         // delete the mixcore config to avoid being handled further by the worker
         delete config.mixcore;
     }
-    let localFFIkind = {};
-    let localFFIfuns = {};
-    for (const [k, v] of Object.entries(localFFIs)) {
-        localFFIfuns[k] = {...v};
+    let starterFFIkind = {};
+    let starterFFIfuns = {};
+    for (const [k, v] of Object.entries(starterFFIs)) {
+        starterFFIfuns[k] = {...v};
         if (v.isRaw && (v.canFail || v.useJsonDecoder)) {
-            console.error("A raw, local FFI must neither be failing nor use the JSON decoder: " + k);
+            console.error("A raw, starter FFI must neither be failing nor use the JSON decoder: " + k);
         } else {
-            localFFIkind[k] = {...v};
-            delete localFFIkind[k].run;
+            starterFFIkind[k] = {...v};
+            delete starterFFIkind[k].run;
         }
     };
     let vm_kind = { isRaw:false, canFail:false, useJsonDecoder:false};
-    localFFIkind["$vm_start"] = vm_kind;
-    localFFIfuns["$vm_start"] = ffi_vm_start;
-    localFFIkind["$vm_stop"] = vm_kind;
-    localFFIfuns["$vm_stop"] = ffi_vm_stop;
+    starterFFIkind["$vm_start"] = vm_kind;
+    starterFFIfuns["$vm_start"] = ffi_vm_start;
+    starterFFIkind["$vm_stop"] = vm_kind;
+    starterFIfuns["$vm_stop"] = ffi_vm_stop;
     let mixrtCode = config.mixrtCode;
     if (typeof(mixrtCode) == "string" && mixrtCode.startsWith("remix://")) {
         // for the desktop only: precompile the mixrt module to get faster
@@ -163,7 +165,7 @@ async function StartWASM2(hub, config) {
             globalThis.mixrtCodeModule = mixrtCode;
         }
     };
-    ffiLoops[config.vmID] = setupLocalFFIs(hub, config, localFFIfuns);
+    ffiLoops[config.vmID] = setupStarterFFIs(hub, config, starterFFIfuns);
     blobsLoops[config.vmID] = setupBlobs(hub, config);
     let config_msg =
         { "_rmx_type": "msg_vm_configure",
@@ -177,7 +179,7 @@ async function StartWASM2(hub, config) {
           "outputViaMQTT": !(config.noOutputViaMQTT),
           "machType": config.machType,
           "debugMask": initialMask,
-          "localFFIs": localFFIkind,
+          "starterFFIs": starterFFIkind,
           "allowInsecureHttp": globalThis.GROOVEBOX_ALLOW_INSECURE_HTTP,
           "interceptFFI": config.interceptFFI,
           "interceptDynloadFFI": config.interceptDynloadFFI,
@@ -335,14 +337,14 @@ function decode(val) {
 
 // spawn the messaging loop and return an object with a function to terminate
 // the loop `{terminate: () => void}`
-function setupLocalFFIs(hub, config, localFFIs) {
+function setupStarterFFIs(hub, config, starterFFIs) {
     let vmID = config.vmID;
     let terminate = Promise.withResolvers();
-    localFFIsMessageLoop(hub, config, localFFIs, terminate.promise); // don't wait
+    starterFFIsMessageLoop(hub, config, starterFFIs, terminate.promise); // don't wait
     return {terminate: terminate.resolve};
 }
 
-async function localFFIsMessageLoop(hub, config, localFFIs, terminate) {
+async function starterFFIsMessageLoop(hub, config, starterFFIs, terminate) {
     let vmID = config.vmID;
     let channel = await hub.newChannel();
     let comm = new FFIComm(vmID, hub, channel);
@@ -361,11 +363,11 @@ async function localFFIsMessageLoop(hub, config, localFFIs, terminate) {
         let name = msg.payload.name;
         let call_id = msg.payload.callID;
         let args = decode(msg.payload.args);
-        let fun = localFFIs[name];
+        let fun = starterFFIs[name];
         if (initialMask & DEBUG_STATE)
-            console.debug("[groovebox-starter] local FFI call", vmID, call_id, name);
+            console.debug("[groovebox-starter] starter FFI call", vmID, call_id, name);
         try {
-            if (!fun) throw new Error("No such local FFI in groovebox starter: " + name);
+            if (!fun) throw new Error("No such starter FFI in groovebox starter: " + name);
             let connector =
                 { call_id: call_id,
                   hub: hub,
@@ -467,7 +469,7 @@ class FFIComm {
                 name = result._rmx_type.substring(10);
                 arg = result._rmx_value;
             } else {
-                return this.error(call_id, "expected result from local FFI that can fail");
+                return this.error(call_id, "expected result from starter FFI that can fail");
             }
             switch (name) {
             case "ok":
@@ -475,7 +477,7 @@ class FFIComm {
             case "error":
                 return this.error(call_id, arg);
             default:
-                return this.error(call_id, "expected result from local FFI that can fail, found case value " + name);
+                return this.error(call_id, "expected result from starter FFI that can fail, found case value " + name);
             }
         } else {
             return this.return_(fun, call_id, result);
@@ -500,15 +502,15 @@ async function getMixcoreFFIs(config) {
     let names = await mixcore.ffiNames();
     names = filterFFINames(names, config.enableFFIs, config.disableFFIs);
 
-    let localFFIs = {};
+    let starterFFIs = {};
     for (let name of names) {
-        localFFIs[name] = {
+        starterFFIs[name] = {
             isRaw: true,
             run: (conn, argsBuf) => mixcore.ffiDispatch(conn.call_id, name, argsBuf),
         };
     }
 
-    return localFFIs;
+    return starterFFIs;
 }
 
 // use terminateVM to shut a worker down!

package/groovebox_build.js

@@ -1,2 +1,2 @@
-var GROOVEBOX_BUILD = "3275";
+var GROOVEBOX_BUILD = "3278";
 export { GROOVEBOX_BUILD }

package/package.json

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