@remix_labs/machine-starter 2.2216.0-dev → 2.2220.0-dev

package/common.js

@@ -1,5 +1,5 @@
 import { GROOVEBOX_BUILD } from "./groovebox_build.js";
-import { mixcoreFFIs } from "./mixcore-common.js";
+import { filterFFINames } from "./mixcore-common.js";
 import { nanoid } from "nanoid";
 
 let workers = {};
@@ -57,8 +57,7 @@ function StartWASM(hub, baseURL, org, workspace, vmID, user, token, noOutputViaM
     })
 }
 
-function makeLocalFFIs(mixcore, names) {
-    console.log("Mixcore FFIs (local)", names);
+function mixcoreLocalFFIs(mixcore, names) {
     return Object.fromEntries(
         names.map(name => [name, {
             isRaw: true,
@@ -66,41 +65,44 @@ function makeLocalFFIs(mixcore, names) {
         }]));
 }
 
-// See `mix-rs/mixcore/bindings/javascript/mixcore.js` for a description of the
-// values of config.mixcore.
+// See `mix-rs/mixcore/README.md` for a description of the values of
+// config.mixcore.
 async function StartWASM2(hub, config) {
     console.log("GROOVEBOX_BUILD (machine-starter)", GROOVEBOX_BUILD);
     let channel = await hub.newChannel();
     // injected by either index.js or node.js
     let worker = globalThis.GetMachineWASMWorker();
     workers[config.vmID] = worker;
+    let mixcore = null;
     let localFFIs = config.localFFIs || {};
     if (config.mixcore && config.mixcore.kind == 'mixcore') {
-        let {mixcore, enableFFIs, disableFFIs} = config.mixcore;
-        let ffiNames = await mixcoreFFIs(mixcore, enableFFIs, disableFFIs);
-        let ffis = makeLocalFFIs(mixcore, ffiNames);
-        localFFIs = {...localFFIs, ...ffis};
-        config.mixcore = null;
+        let enableFFIs, disableFFIs;
+        ({mixcore, enableFFIs, disableFFIs} = config.mixcore);
+        let ffiNames = filterFFINames(await mixcore.ffiNames(), enableFFIs, disableFFIs);
+        console.log("Mixcore (starter)", mixcore, ffiNames, mixcore.registerDebugObject);
+        localFFIs = {...localFFIs, ...mixcoreLocalFFIs(mixcore, ffiNames)};
+        config.mixcore = {};
+        if (mixcore.registerDebugObject) {
+            config.mixcore.publishDebugObjects = true;
+            subscribeDebugObjects(mixcore, hub, config);
+        }
     }
     let localFFIkind = {};
     let localFFIfuns = {};
-    if (localFFIs) {
-        for (const [k, v] of Object.entries(localFFIs)) {
-            console.log("local FFI", k, v);
-            localFFIfuns[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);
-            } else {
-                localFFIkind[k] = {...v};
-                delete localFFIkind[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;
-    }
+    for (const [k, v] of Object.entries(localFFIs)) {
+        localFFIfuns[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);
+        } else {
+            localFFIkind[k] = {...v};
+            delete localFFIkind[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;
     let config_msg =
         { "_rmx_type": "msg_vm_configure",
           "baseURL": config.baseURL,
@@ -120,8 +122,7 @@ async function StartWASM2(hub, config) {
           "mixcore": config.mixcore,
         };
     worker.postMessage(config_msg, [ channel.port ]);
-    if (localFFIs)
-        setupLocalFFIs(hub, config, localFFIfuns);  // don't await!
+    setupLocalFFIs(hub, config, localFFIfuns);  // don't await!
     return worker;
 }
 
@@ -281,8 +282,7 @@ async function setupLocalFFIs(hub, config, localFFIs) {
         let args = decode(msg.payload.args);
         let fun = localFFIs[name];
         try {
-            if (!fun)
-                throw new Error("no such local FFI: " + name);
+            if (!fun) throw new Error("no such local FFI: " + name);
             let connector =
                 { call_id: call_id,
                   hub: hub,
@@ -305,6 +305,19 @@ async function setupLocalFFIs(hub, config, localFFIs) {
     }
 }
 
+async function subscribeDebugObjects(mixcore, hub, config) {
+    let channel = await hub.newChannel();
+    let vmID = config.vmID;
+    await channel.setLocalSubTopic(`/debug-objects/${vmID}`);
+    let sub = await channel.subscribe(`/debug-objects/${vmID}`);
+    while (true) {
+        let msg = await sub.next();
+        let id = msg.payload.id;
+        let code = msg.payload.code;
+        mixcore.registerDebugObject(id, code);
+    }
+}
+
 class FFIComm {
     constructor(vmID, hub, channel) {
         this.vmID = vmID;

package/groovebox_build.js

@@ -1,2 +1,2 @@
-var GROOVEBOX_BUILD = "2393";
+var GROOVEBOX_BUILD = "2397";
 export { GROOVEBOX_BUILD }