@remix_labs/machine-starter 2.3101.0-dev → 2.3105.0-dev

package/common.js

@@ -5,31 +5,18 @@ import { MixcoreTauri, filterFFINames } from "./mixcore.lib.mjs";
 let workers = {};
 let children = {};
 let ffiLoops = {};
-let blobs = {};
-let blobsLoops = {};
 
 function terminateAll() {
     console.log("[groovebox-starter] terminate all VMs");
     for (let [vmID, worker] of Object.entries(workers)) {
         worker.terminate();
     };
-    for (let [vmID, blobs] of Object.entries(blobs)) {
-        for (let blob_url of blobs) {
-            console.log("[groovebox-starter] revoke ", blob_url);
-            URL.revokeObjectURL(blob_url);
-        }
-    };
     for (let ffiLoop of Object.values(ffiLoops)) {
         ffiLoop.terminate();
     }
-    for (let blobsLoop of Object.values(blobsLoops)) {
-        blobsLoop.terminate();
-    }
     workers = {};
     children = {};
     ffiLoops = {};
-    blobs = {};
-    blobsLoops = {};
 }
 
 function terminateVM(vmID) {
@@ -37,20 +24,12 @@ function terminateVM(vmID) {
     let worker = workers[vmID];
     if (worker) {
         let vmChildren = children[vmID];
-        let blobList = blobs[vmID] || [];
         let ffiLoop = ffiLoops[vmID];
-        let blobsLoop = blobsLoops[vmID];
         delete workers[vmID];
         delete children[vmID];
         delete ffiLoops[vmID];
-        delete blobsLoops[vmID];
         worker.terminate();
         ffiLoop.terminate();
-        blobsLoop.terminate();
-        for (let blob_url of blobList) {
-            console.log("[groovebox-starter] revoke ", blob_url);
-            URL.revokeObjectURL(blob_url);
-        };
         if (vmChildren) {
             for (let subID of vmChildren) {
                 terminateVM(subID)
@@ -122,7 +101,6 @@ async function StartWASM2(hub, config) {
     localFFIkind["$vm_stop"] = vm_kind;
     localFFIfuns["$vm_stop"] = ffi_vm_stop;
     ffiLoops[config.vmID] = setupLocalFFIs(hub, config, localFFIfuns);
-    blobsLoops[config.vmID] = setupBlobs(hub, config);
     let config_msg =
         { "_rmx_type": "msg_vm_configure",
           "baseURL": config.baseURL,
@@ -344,35 +322,6 @@ async function localFFIsMessageLoop(hub, config, localFFIs, terminate) {
     }
 }
 
-function setupBlobs(hub, config) {
-    let vmID = config.vmID;
-    let terminate = Promise.withResolvers();
-    blobsMessageLoop(hub, config, terminate.promise); // don't wait
-    return {terminate: terminate.resolve};
-}
-async function blobsMessageLoop(hub, config, terminate) {
-    let vmID = config.vmID;
-    let channel = await hub.newChannel();
-    let comm = new FFIComm(vmID, hub, channel);
-    let sub = await channel.subscribe("/local/" + vmID + "/blobs");
-    while (true) {
-        let {msg, terminated} = await Promise.race([
-            sub.next().then((msg) => ({msg})),
-            terminate.then(() => ({terminated: true})),
-        ]);
-        if (terminated) {
-            console.log("[groovebox-starter] terminate blobs loop", vmID);
-            return;
-        }
-        let name = msg.payload.name;
-        let url = msg.payload.url;
-        let blobList = blobs[vmID];
-        if (!blobList) blobList = [];
-        blobList.push(url);
-        blobs[vmID] = blobList;
-    }
-}
-
 class FFIComm {
     constructor(vmID, hub, channel) {
         this.vmID = vmID;

package/groovebox_build.js

@@ -1,2 +1,2 @@
-var GROOVEBOX_BUILD = "3451";
+var GROOVEBOX_BUILD = "3455";
 export { GROOVEBOX_BUILD }

package/package.json

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

package/start.js

@@ -1,16 +1,6 @@
 import Process from "process";
 import { StartWASM2, Hub } from "./node.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);
+import { mixcoreWasmBase64, mixcoreJsBase64 } from './mixcore-wasm.js';
 
 if (Process.stdout._handle)
     Process.stdout._handle.setBlocking(true);
@@ -42,46 +32,43 @@ 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 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,
-                });
+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",
+    createDbs: ["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,
             });
-            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))
+    }
 });