@remix_labs/machine-starter 2.3356.0 → 2.3362.0-dev

package/common.js

@@ -1,6 +1,6 @@
 import { GROOVEBOX_BUILD } from "./groovebox_build.js";
 import { nanoid } from "nanoid";
-import { MixcoreTauri, filterFFINames } from "./mixcore.lib.mjs";
+import { createStarterMixcore } from "./mixcore-groovebox-starter.lib.mjs";
 
 const DEBUG_STATE = 4;
 
@@ -126,11 +126,10 @@ async function StartWASM2(hub, config) {
     let starterFFIs = config.localFFIs || {};
     // from now on, the "local" FFIs are called "starter" FFIs, because this
     // distinguishes these from other locally defined FFIs
-    let mixcoreFFIs = await getMixcoreFFIs(config.mixcore);
-    if (mixcoreFFIs) {
-        console.log("[machine-starter] mixcore FFIs", Object.keys(mixcoreFFIs));
+    let mixcore = await createStarterMixcore(config.mixcore);
+    if (mixcore) {
         // merge the ffis and store them back into the config so sub vms also get them
-        config.localFFIs = Object.assign(starterFFIs, mixcoreFFIs);
+        config.localFFIs = Object.assign(starterFFIs, await mixcoreStarterFFIs(mixcore));
         // delete the mixcore config to avoid being handled further by the worker
         delete config.mixcore;
     }
@@ -192,6 +191,11 @@ async function StartWASM2(hub, config) {
     return worker;
 }
 
+async function mixcoreStarterFFIs(mixcore) {
+    let names = await mixcore.ffiNames();
+    return Object.fromEntries(names.map(name => [name, {isRaw: true, run}]));
+}
+
 async function ffi_vm_start(conn, args) {
     let vm_id = "embedded." + nanoid();
     console.log("[machine-starter] starting VM: ", vm_id);
@@ -485,34 +489,6 @@ class FFIComm {
     }
 }
 
-async function getMixcoreFFIs(config) {
-    let mixcore;
-    switch (config?.kind) {
-    case 'mixcore':
-        mixcore = config.mixcore;
-        break;
-    case 'tauri':
-        mixcore = await MixcoreTauri.create(config.workspace, config.app);
-        break;
-    default:
-        console.warn("[machine-starter] not going to configure mixcore - kind: ", config?.kind);
-        return;
-    }
-
-    let names = await mixcore.ffiNames();
-    names = filterFFINames(names, config.enableFFIs, config.disableFFIs);
-
-    let starterFFIs = {};
-    for (let name of names) {
-        starterFFIs[name] = {
-            isRaw: true,
-            run: (conn, argsBuf) => mixcore.ffiDispatch(conn.call_id, name, argsBuf),
-        };
-    }
-
-    return starterFFIs;
-}
-
 // use terminateVM to shut a worker down!
 export { StartWASM, StartWASM2, terminateAll, terminateVM,
          Token, Case, Opaque

package/groovebox_build.js

@@ -1,2 +1,2 @@
-var GROOVEBOX_BUILD = "3356";
+var GROOVEBOX_BUILD = "3362";
 export { GROOVEBOX_BUILD }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@remix_labs/machine-starter",
-  "version": "2.3356.0",
+  "version": "2.3362.0-dev",
   "description": "start the groove",
   "main": "node.js",
   "browser": "index.js",
@@ -11,7 +11,7 @@
   "author": "Remixlabs staff",
   "license": "ISC",
   "dependencies": {
-    "@remix_labs/hub-client": "2.3356.0",
+    "@remix_labs/hub-client": "2.3362.0-dev",
     "nanoid": "^5.0.2",
     "web-worker": "^1.2.0"
   },

package/start.js

@@ -32,12 +32,17 @@ let noOutputViaMQTT = Process.env["MIX_MQTT_NO_OUTPUT"] !== undefined;
 console.log("Machine params: variant=" + variant + " baseURL=" + baseURL, " mqttURL=" + mqttURL, " mqttUser=" + mqttUser, " mqttToken=" + mqttToken, " id=" + id, " noOutputViaMQTT=" + noOutputViaMQTT);
 let w = new Hub.Worker();
 globalThis.GROOVEBOX_ALLOW_INSECURE_HTTP = true;
+
+// Node does not support blob URLs (for dynamic import?), resulting in error:
+// [ERR_UNSUPPORTED_ESM_URL_SCHEME]: Only URLs with a scheme in: file, data, and
+// node are supported by the default ESM loader. Received protocol 'blob:'
+let mixcoreJsUrl = "data:text/javascript;base64," + mixcoreJsBase64;
 let mixcoreWasmUrl = "data:application/wasm;base64," + mixcoreWasmBase64;
-let mixcoreJsUrl = "data:text/javascript;charset=utf-8;base64," + mixcoreJsBase64;
+
 let mixcore = {
-    kind: "wasm-opfs",
-    mixcoreWasmUrl,
+    kind: "wasm",
     mixcoreJsUrl,
+    mixcoreWasmUrl,
     dbDir: "/databases",
     dbUser: "test@user",
     dbName: "compiler-testing",