@remix_labs/machine-starter 2.2192.0-dev → 2.2194.0-dev

package/common.js

@@ -1,5 +1,4 @@
 import { GROOVEBOX_BUILD } from "./groovebox_build.js";
-import { mixcoreFFIs } from "./mixcore-common.js";
 import { nanoid } from "nanoid";
 
 let workers = {};
@@ -57,72 +56,52 @@ function StartWASM(hub, baseURL, org, workspace, vmID, user, token, noOutputViaM
     })
 }
 
-function makeLocalFFIs(mixcore, names) {
-    console.log("Mixcore FFIs (local)", names);
-    return Object.fromEntries(
-        names.map(name => [name, {
-            isRaw: true,
-            run: (conn, argsBuf) => mixcore.ffiDispatch(conn.call_id, name, argsBuf),
-        }]));
-}
-
-// See `mix-rs/mixcore/bindings/javascript/mixcore.js` 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 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 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;
-    }
-    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 ]);
-    if (localFFIs)
-        setupLocalFFIs(hub, config, localFFIfuns);  // don't await!
-    return worker;
+    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 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) {

package/groovebox_build.js

@@ -1,2 +1,2 @@
-var GROOVEBOX_BUILD = "2364";
+var GROOVEBOX_BUILD = "2366";
 export { GROOVEBOX_BUILD }