@remix_labs/machine-starter 2.2126.0 → 2.2130.0-dev

package/common.js

@@ -1,4 +1,5 @@
 import { GROOVEBOX_BUILD } from "./groovebox_build.js";
+import { mixcoreFromConfig } from "./mixcore.js";
 import { nanoid } from "nanoid";
 
 let workers = {};
@@ -56,52 +57,64 @@ function StartWASM(hub, baseURL, org, workspace, vmID, user, token, noOutputViaM
     })
 }
 
-function StartWASM2(hub, config) {
+// See `mix-rs/mixcore/bindings/javascript/mixcore.js` for a description of the
+// values of config.mixcore.
+async function StartWASM2(hub, config) {
     console.log("GROOVEBOX_BUILD (machine-starter)", GROOVEBOX_BUILD);
-    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;
-    })
+    let channel = await hub.newChannel();
+    // injected by either index.js or node.js
+    let worker = globalThis.GetMachineWASMWorker();
+    workers[config.vmID] = worker;
+    let mixcoreConfig = config.mixcore;
+    let localFFIs = config.localFFIs;
+    let localFFIkind = {};
+    let localFFIfuns = {};
+
+    if (mixcoreConfig && mixcoreConfig.kind == "mixcore") {
+        // this is the only mixcore kind that has to be realized in the starter,
+        // because it cannot be sent to the worker
+        let mixcore = await mixcoreFromConfig(mixcoreConfig);
+        localFFIs = {...localFFIs, ...mixcore.localFFIs()};
+        mixcoreConfig = null; // this gets passed on to the worker
+    }
+    if (localFFIs) {
+        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,
+          "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": mixcoreConfig,
+        };
+    worker.postMessage(config_msg, [ channel.port ]);
+    if (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 = "2286";
+var GROOVEBOX_BUILD = "2292";
 export { GROOVEBOX_BUILD }