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

package/common.js

@@ -1,5 +1,4 @@
 import { GROOVEBOX_BUILD } from "./groovebox_build.js";
-import { filterFFINames } from "./mixcore-common.js";
 import { nanoid } from "nanoid";
 
 let workers = {};
@@ -57,35 +56,17 @@ function StartWASM(hub, baseURL, org, workspace, vmID, user, token, noOutputViaM
     })
 }
 
-function mixcoreLocalFFIs(mixcore, names) {
-    return Object.fromEntries(
-        names.map(name => [name, {
-            isRaw: true,
-            run: (conn, argsBuf) => mixcore.ffiDispatch(conn.call_id, name, argsBuf),
-        }]));
-}
-
-// See `mix-rs/mixcore/README.md` for a description of the values of
-// config.mixcore.
 async function StartWASM2(hub, config) {
     console.log("GROOVEBOX_BUILD (machine-starter)", GROOVEBOX_BUILD);
     let channel = await hub.newChannel();
     // injected by either index.js or node.js
     let worker = globalThis.GetMachineWASMWorker();
     workers[config.vmID] = worker;
-    let mixcore = null;
     let localFFIs = config.localFFIs || {};
-    if (config.mixcore && config.mixcore.kind == 'mixcore') {
-        let enableFFIs, disableFFIs;
-        ({mixcore, enableFFIs, disableFFIs} = config.mixcore);
-        let ffiNames = filterFFINames(await mixcore.ffiNames(), enableFFIs, disableFFIs);
-        console.log("Mixcore (starter)", mixcore, ffiNames, mixcore.registerDebugObject);
-        localFFIs = {...localFFIs, ...mixcoreLocalFFIs(mixcore, ffiNames)};
-        config.mixcore = {};
-        if (mixcore.registerDebugObject) {
-            config.mixcore.publishDebugObjects = true;
-            subscribeDebugObjects(mixcore, hub, config);
-        }
+    let mixcoreFFIs = await getMixcoreFFIs(config.mixcore);
+    if (mixcoreFFIs) {
+        delete config.mixcore;
+        Object.assign(localFFIs, mixcoreFFIs);
     }
     let localFFIkind = {};
     let localFFIfuns = {};
@@ -308,19 +289,6 @@ async function setupLocalFFIs(hub, config, localFFIs) {
     }
 }
 
-async function subscribeDebugObjects(mixcore, hub, config) {
-    let channel = await hub.newChannel();
-    let vmID = config.vmID;
-    await channel.setLocalSubTopic(`/debug-objects/${vmID}`);
-    let sub = await channel.subscribe(`/debug-objects/${vmID}`);
-    while (true) {
-        let msg = await sub.next();
-        let id = msg.payload.id;
-        let code = msg.payload.code;
-        mixcore.registerDebugObject(id, code);
-    }
-}
-
 class FFIComm {
     constructor(vmID, hub, channel) {
         this.vmID = vmID;
@@ -377,6 +345,58 @@ 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:
+        return;
+    }
+    let names = await mixcore.ffiNames();
+    return Object.fromEntries(
+        names.map(name => [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);
+    }
+}
+
 // use worker.terminate() to shut a worker down!
 
 export { StartWASM, StartWASM2, terminateAll, terminateVM,

package/groovebox_build.js

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

package/package.json

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