@remix_labs/machine-starter 2.3039.0-dev → 2.3041.0

package/groovebox_build.js

@@ -1,2 +1,2 @@
-var GROOVEBOX_BUILD = "3366";
+var GROOVEBOX_BUILD = "3368";
 export { GROOVEBOX_BUILD }

package/package.json

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

package/start.js

@@ -1,6 +1,16 @@
 import Process from "process";
 import { StartWASM2, Hub } from "./node.js";
-import { mixcoreWasmBase64, mixcoreJsBase64 } from './mixcore-wasm.js';
+import { MixcoreWasm, MixcoreWasmApi } from "./mixcore.lib.mjs";
+import { mixcoreWasmCode } from './mixcore-wasm.js';
+import { WASI, OpenFile, File, Directory, PreopenDirectory, ConsoleStdout } from "@bjorn3/browser_wasi_shim";
+function importCode(base64) {
+    let binstr = atob(base64);
+    let code = new Uint8Array(binstr.length);
+    for (let i = 0; i < binstr.length; i++)
+        code[i] = binstr.charCodeAt(i);
+    return code;
+}
+let mixcoreWasm = importCode(mixcoreWasmCode);
 
 if (Process.stdout._handle)
     Process.stdout._handle.setBlocking(true);
@@ -32,42 +42,46 @@ 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 mixcore = {
-    kind: "wasm-opfs",
-    mixcoreWasmUrl: "data:application/wasm;base64," + mixcoreWasmBase64,
-    mixcoreJsUrl: "data:text/javascript;charset=utf-8;base64," + mixcoreJsBase64,
-    dbDir: "/databases",
-    dbUser: "test@user",
-    dbName: "compiler-testing",
-};
-w.configure({wsURL: mqttURL, user:mqttUser, token:mqttToken}).then(resp => {
-    if (variant == "BYTE") variant = "QCODE";
-    switch(variant) {
-    case "WASM":
-    case "WAT":
-    case "QCODE":
-        let startVM = (_ => {
-            MixSetMask(64 + 256 + 512 + 1024);
-            StartWASM2(w, {
-                baseURL: baseURL,
-                org: "local",
-                workspace: "local",
-                vmID: id,
-                user: mqttUser,
-                token: mqttToken,
-                noOutputViaMQTT: noOutputViaMQTT,
-                machType: variant,
-                localFFIs: {},
-                mixcore,
+
+let DB_DIR = "db";
+let wasi = new WASI([], [], [
+    new OpenFile(new File([])),
+    ConsoleStdout.lineBuffered(msg => console.log(`[WASI stdout] ${msg}`)),
+    ConsoleStdout.lineBuffered(msg => console.warn(`[WASI stderr] ${msg}`)),
+    new PreopenDirectory(".", new Map([[DB_DIR, new Directory(new Map())]]))
+]);
+MixcoreWasmApi.create(mixcoreWasm, wasi).then(mixcoreWasmApi => {
+    let mixcore = MixcoreWasm.create(DB_DIR, "compiler-testing", "test@user", mixcoreWasmApi);
+    let mixcoreConfig = { kind: "mixcore", mixcore };
+    w.configure({wsURL: mqttURL, user:mqttUser, token:mqttToken}).then(resp => {
+        if (variant == "BYTE") variant = "QCODE";
+        switch(variant) {
+        case "WASM":
+        case "WAT":
+        case "QCODE":
+            let startVM = (_ => {
+                MixSetMask(64 + 256 + 512 + 1024);
+                StartWASM2(w, {
+                    baseURL: baseURL,
+                    org: "local",
+                    workspace: "local",
+                    vmID: id,
+                    user: mqttUser,
+                    token: mqttToken,
+                    noOutputViaMQTT: noOutputViaMQTT,
+                    machType: variant,
+                    localFFIs: {},
+                    mixcore: mixcoreConfig,
+                });
             });
-        });
-        if (globalThis.EnableAndStartMixCompiler) {
-            EnableAndStartMixCompiler(w).then(startVM);
-        } else {
-            startVM()
-        };
-        break
-    default:
-        throw(new Error("unknown MIX_MACHINE_VARIANT: " + variant))
-    }
+            if (globalThis.EnableAndStartMixCompiler) {
+                EnableAndStartMixCompiler(w).then(startVM);
+            } else {
+                startVM()
+            };
+            break
+        default:
+            throw(new Error("unknown MIX_MACHINE_VARIANT: " + variant))
+        }
+    })
 });