@remix_labs/machine-starter 2.3315.0 → 2.3326.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 { getMixcoreFFIs } from "./mixcore-groovebox-starter.lib.mjs";
 
 const DEBUG_STATE = 4;
 
@@ -485,34 +485,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 = "3315";
+var GROOVEBOX_BUILD = "3326";
 export { GROOVEBOX_BUILD }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@remix_labs/machine-starter",
-  "version": "2.3315.0",
+  "version": "2.3326.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.3315.0",
+    "@remix_labs/hub-client": "2.3326.0-dev",
     "nanoid": "^5.0.2",
     "web-worker": "^1.2.0"
   },

package/start.js

@@ -32,12 +32,18 @@ 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;
-let mixcoreWasmUrl = "data:application/wasm;base64," + mixcoreWasmBase64;
-let mixcoreJsUrl = "data:text/javascript;charset=utf-8;base64," + mixcoreJsBase64;
+let mixcoreJsBytes = Buffer.from(mixcoreJsBase64, 'base64').toString('utf8')
+let mixcoreJsUrl = URL.createObjectURL(
+    new Blob([mixcoreJsBytes], { type: 'text/javascript' })
+);
+let mixcoreWasmBytes = Buffer.from(mixcoreWasmBase64, 'base64')
+let mixcoreWasmUrl = URL.createObjectURL(
+    new Blob([mixcoreWasmBytes], { type: 'application/wasm' })
+);
 let mixcore = {
     kind: "wasm-opfs",
-    mixcoreWasmUrl,
     mixcoreJsUrl,
+    mixcoreWasmUrl,
     dbDir: "/databases",
     dbUser: "test@user",
     dbName: "compiler-testing",