@remix_labs/machine-starter 2.2241.0-dev → 2.2246.0-dev

package/common.js

@@ -1,5 +1,4 @@
 import { GROOVEBOX_BUILD } from "./groovebox_build.js";
-import { filterFFINames } from "./mixcore-common.js";
 import { nanoid } from "nanoid";
 
 let workers = {};
@@ -57,73 +56,52 @@ function StartWASM(hub, baseURL, org, workspace, vmID, user, token, noOutputViaM
     })
 }
 
-function mixcoreLocalFFIs(mixcore, names) {
-    return Object.fromEntries(
-        names.map(name => [name, {
-            isRaw: true,
-            run: (conn, argsBuf) => mixcore.ffiDispatch(conn.call_id, name, argsBuf),
-        }]));
-}
-
-// See `mix-rs/mixcore/README.md` for a description of the values of
-// config.mixcore.
-async function StartWASM2(hub, config) {
+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 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 = {};
-    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;
+    return hub.newChannel().then(channel => {
+        // injected by either index.js or node.js
+        let worker = globalThis.GetMachineWASMWorker();
+        workers[config.vmID] = worker;
+        let localFFIkind = {};
+        let localFFIfuns = {};
+        if (config.localFFIs) {
+            for (const [k, v] of Object.entries(config.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 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,
-          "org": config.org,
-          "workspace": config.workspace,
-          "vmID": config.vmID,
-          "user": config.user,
-          "token": config.token,
-          "hub": channel.port,
-          "outputViaMQTT": !(config.noOutputViaMQTT),
-          "machType": config.machType,
-          "debugMask": initialMask,
-          "localFFIs": localFFIkind,
-          "allowInsecureHttp": globalThis.GROOVEBOX_ALLOW_INSECURE_HTTP,
-          "interceptFFI": config.interceptFFI,
-          "interceptDynloadFFI": config.interceptDynloadFFI,
-          "mixcore": config.mixcore,
-        };
-    worker.postMessage(config_msg, [ channel.port ]);
-    setupLocalFFIs(hub, config, localFFIfuns);  // don't await!
-    return worker;
+        let config_msg =
+            { "_rmx_type": "msg_vm_configure",
+              "baseURL": config.baseURL,
+              "org": config.org,
+              "workspace": config.workspace,
+              "vmID": config.vmID,
+              "user": config.user,
+              "token": config.token,
+              "hub": channel.port,
+              "outputViaMQTT": !(config.noOutputViaMQTT),
+              "machType": config.machType,
+              "debugMask": initialMask,
+              "localFFIs": localFFIkind,
+              "allowInsecureHttp": globalThis.GROOVEBOX_ALLOW_INSECURE_HTTP,
+              "interceptFFI": config.interceptFFI,
+              "interceptDynloadFFI": config.interceptDynloadFFI,
+            };
+        worker.postMessage(config_msg, [ channel.port ]);
+        if (config.localFFIs)
+            setupLocalFFIs(hub, config, localFFIfuns);  // don't await!
+        return worker;
+    })
 }
 
 async function ffi_vm_start(conn, args) {
@@ -282,7 +260,8 @@ 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,19 +284,6 @@ 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 = "2419";
+var GROOVEBOX_BUILD = "2423";
 export { GROOVEBOX_BUILD }