@remix_labs/machine-starter 2.2786.0-dev → 2.2792.0-dev

package/common.js

@@ -1,5 +1,6 @@
 import { GROOVEBOX_BUILD } from "./groovebox_build.js";
 import { nanoid } from "nanoid";
+import { MixcoreTauri } from "mixcore";
 
 let workers = {};
 let children = {};
@@ -63,10 +64,10 @@ async function StartWASM2(hub, config) {
     let worker = globalThis.GetMachineWASMWorker();
     workers[config.vmID] = worker;
     let localFFIs = config.localFFIs || {};
-    let mixcoreFFIs = await getMixcoreFFIs(config.mixcore);
-    if (mixcoreFFIs) {
+    let mixcore = await getMixcore(config.mixcore);
+    if (mixcore) {
         delete config.mixcore;
-        Object.assign(localFFIs, mixcoreFFIs);
+        await assignMixcoreLocalFFIs(localFFIs, mixcore);
     }
     let localFFIkind = {};
     let localFFIfuns = {};
@@ -345,55 +346,25 @@ class FFIComm {
     }
 }
 
-async function getMixcoreFFIs(config) {
+async function getMixcore(config) {
     let mixcore;
     switch (config?.kind) {
     case 'mixcore':
-        mixcore = config.mixcore;
-        break;
+        return config.mixcore;
     case 'tauri':
-        mixcore = await MixcoreTauri.create(config.workspace, config.app);
-        break;
+        return await MixcoreTauri(config.workspace, config.app);
     default:
         return;
     }
+}
+
+async function assignMixcoreLocalFFIs(localFFIs, mixcore) {
     let names = await mixcore.ffiNames();
-    return Object.fromEntries(
-        names.map(name => [name, {
+    for (let name of names) {
+        localFFIs[name] = {
             isRaw: true,
             run: (conn, argsBuf) => mixcore.ffiDispatch(conn.call_id, name, argsBuf),
-        }]));
-}
-
-// tauri commands cannot be dispatched in the worker, so we have to do it here
-class MixcoreTauri {
-
-    constructor(id) {
-        this.id = id;
-    }
-
-    static async create(workspace, app) {
-        let id = await window.__TAURI__.core.invoke(
-            "mixcore_setup",
-            { workspace, app },
-        );
-        return new MixcoreTauri(id);
-    }
-
-    async ffiNames() {
-        return await window.__TAURI__.core.invoke(
-            "mixcore_ffi_names",
-            {id: this.id},
-        );
-    }
-
-    async ffiDispatch(co, name, argsBuf32) {
-        let argsBuf = Array.from(new Uint8Array(argsBuf32.buffer));
-        let resBuf = await window.__TAURI__.core.invoke(
-            "mixcore_ffi_dispatch",
-            { id: this.id, co, name, argsBuf },
-        );
-        return new Uint8Array(resBuf);
+        };
     }
 }
 

package/groovebox_build.js

@@ -1,2 +1,2 @@
-var GROOVEBOX_BUILD = "3039";
+var GROOVEBOX_BUILD = "3050";
 export { GROOVEBOX_BUILD }

package/package.json

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

package/start.js

@@ -1,7 +1,7 @@
 import Process from "process";
 import { StartWASM2, Hub } from "./node.js";
 import { MixcoreWasm, MixcoreWasmApi } from "mixcore";
-import { mixcoreWasmCode } from './mixcore-wasm-main.js';
+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);