@remix_labs/machine-starter 2.2050.0-dev → 2.2053.0-dev

package/common.js

@@ -1,4 +1,5 @@
 import { GROOVEBOX_BUILD } from "./groovebox_build.js";
+import { mixcoreFromConfigStarter } from "./mixcore.js";
 import { nanoid } from "nanoid";
 
 let workers = {};
@@ -56,20 +57,8 @@ function StartWASM(hub, baseURL, org, workspace, vmID, user, token, noOutputViaM
     })
 }
 
-// The parameter config.mixcore controls the mixcore integration. it can be one
-// of the following:
-//
-// - {kind: "mixcore", mixcore: Mixcore}: use an already instantiated Mixcore
-// - {kind: "webkit"}: use Webkit backend implemented in
-//   `mixcore/bindings/swift/Mixcore.swift` and used in flutter-runtime
-//   (AppClipWebview.swift and appclip.html)
-// - {kind: "tauri", dbDir: STRING, dbName: STRING, dbUser: STRING}: use
-//   Tauri backend for turntable/remix-desktop, implemented in
-//   `mix-rs/mixcore/bindings/tauri/mixcore_tauri.rs`
-// - {kind: "wasm", dbDir: STRING, dbName: STRING, dbUser: STRING, url: STRING}:
-//    use the Wasm backend, the `url` can something `fetch`able, or `file://` on
-//    node
-// - {kind: "serviceworker", url: STRING, "dbName": STRING, "dbUser": STRING}
+// See `mix-rs/mixcore/bindings/javascript/mixcore.js` 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();
@@ -81,25 +70,11 @@ async function StartWASM2(hub, config) {
     let localFFIkind = {};
     let localFFIfuns = {};
 
-    console.log("MIXCORE CONFIG", mixcoreConfig);
-    if (mixcoreConfig && mixcoreConfig.kind == "mixcore") {
-        await mixcoreConfig.mixcore.setHandleFFIs(mixcoreConfig.includes, mixcoreConfig.excludes);
+    let mixcore = await mixcoreFromConfigStarter(mixcoreConfig);
+    if (mixcore !== null) {
         localFFIs = {...localFFIs, ...mixcore.localFFIs()};
         mixcoreConfig = null;
     }
-    if (mixcoreConfig && mixcoreConfig.kind == "wasm-instance") {
-        // this is the only mixcore configuration that cannot be to the
-        // machine-wasm. the FFIs are registered as localFFIs.
-        let mixcore = new MixcoreWasm(
-            mixcoreConfig.dbDir,
-            mixcoreConfig.dbName,
-            mixcoreConfig.username,
-            mixcoreConfig.instance);
-        await mixcore.setHandleFFIs(mixcoreConfig.includes, mixcoreConfig.excludes);
-        localFFIs = {...localFFIs, ...mixcore.localFFIs()};
-        mixcoreConfig = null;
-    }
-
     if (localFFIs) {
         for (const [k, v] of Object.entries(localFFIs)) {
             localFFIfuns[k] = {...v};

package/groovebox_build.js

@@ -1,2 +1,2 @@
-var GROOVEBOX_BUILD = "2194";
+var GROOVEBOX_BUILD = "2198";
 export { GROOVEBOX_BUILD }