@remix_labs/machine-starter 2.2218.0-dev → 2.2222.0-dev

package/common.js

@@ -1,5 +1,5 @@
 import { GROOVEBOX_BUILD } from "./groovebox_build.js";
-import { mixcoreFFINames } from "./mixcore-common.js";
+import { filterFFINames } from "./mixcore-common.js";
 import { nanoid } from "nanoid";
 
 let workers = {};
@@ -73,14 +73,19 @@ async function StartWASM2(hub, config) {
     // 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 mixcoreFFINames(mixcore, enableFFIs, disableFFIs);
-        console.log("Mixcore FFIs (local)", ffiNames);
-        let mixcoreFFIs = mixcoreLocalFFIs(mixcore, ffiNames);
-        localFFIs = {...localFFIs, ...mixcoreFFIs};
-        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 = {};
@@ -300,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 = "2395";
+var GROOVEBOX_BUILD = "2399";
 export { GROOVEBOX_BUILD }