@remix_labs/machine-starter 2.2002.0 → 2.2004.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@remix_labs/machine-starter",
-  "version": "2.2002.0",
+  "version": "2.2004.0",
   "description": "start the groove",
   "main": "node.js",
   "browser": "index.js",
@@ -11,8 +11,8 @@
   "author": "Remixlabs staff",
   "license": "ISC",
   "dependencies": {
-    "@remix_labs/hub-client": "2.2002.0",
-    "nanoid": "^3.1.12",
+    "@remix_labs/hub-client": "2.2004.0",
+    "nanoid": "^5.0.2",
     "web-worker": "^1.2.0"
   },
   "repository": "https://github.com/remixlabs/groovebox.git"

package/package_pub.json

@@ -12,7 +12,7 @@
   "license": "ISC",
   "dependencies": {
     "@remix_labs/hub-client": "_FULLVERSION_",
-    "nanoid": "^3.1.12",
+    "nanoid": "^5.0.2",
     "web-worker": "^1.2.0"
   },
   "repository": "https://github.com/remixlabs/groovebox.git"

package/start.js

@@ -1,5 +1,6 @@
 import Process from "process";
 import { StartWASM2, Hub } from "./node.js";
+import { StartMixCompiler, WaitForMixCompiler } from "@remix_labs/mixc-starter";
 
 if (Process.stdout._handle)
     Process.stdout._handle.setBlocking(true);
@@ -28,25 +29,42 @@ if (mqttURL.startsWith("https:")) {
 let mqttUser = Process.env["MIX_MQTT_USER"] || "dummy";
 let mqttToken = Process.env["MIX_MQTT_TOKEN"] || "";
 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 with_mixc = !!(Process.env["MIXC_ENABLE"]);
+console.log("Machine params: variant=" + variant + " baseURL=" + baseURL, " mqttURL=" + mqttURL, " mqttUser=" + mqttUser, " mqttToken=" + mqttToken, " id=" + id, " noOutputViaMQTT=" + noOutputViaMQTT, " withMixc=" + with_mixc);
+let protoquery = Process.env["PROTOQUERY_ROOT"] || "";
+let wasm_base = Process.env["MIX_WASM_BASE"] || "file://" + protoquery + "/wasm-build/artifacts/lib/wasm32-unknown-unknown";
 let w = new Hub.Worker();
+globalThis.GROOVEBOX_ALLOW_INSECURE_HTTP = true;
 w.configure({wsURL: mqttURL, user:mqttUser, token:mqttToken}).then(resp => {
     if (variant == "BYTE") variant = "QCODE";
     switch(variant) {
     case "WASM":
     case "WAT":
     case "QCODE":
-        MixSetMask(64 + 256 + 512 + 1024);
-        StartWASM2(w, {
-            baseURL: baseURL,
-            org: "local",
-            workspace: "local",
-            vmID: id,
-            user: mqttUser,
-            token: mqttToken,
-            noOutputViaMQTT: noOutputViaMQTT,
-            machType: variant
+        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: {},
+            });
         });
+        if (with_mixc) {
+            let mixcConfig = {
+                org: "local",
+                workspace: "local",
+                wasm_base: wasm_base
+            };
+            StartMixCompiler(w, mixcConfig).then(startVM);
+        } else {
+            startVM()
+        };
         break
     default:
         throw(new Error("unknown MIX_MACHINE_VARIANT: " + variant))

package/webpack.config.js

@@ -15,15 +15,8 @@ export default [
         optimization: {
             minimize: false,
         },
-        experiments: {
-            outputModule: true
-        },
         output: {
-            chunkFormat: 'module',
-            filename: 'machine-starter.mjs',
-            library : {
-                type: 'module',
-            },
+            filename: 'machine-starter.js',
             path: path.resolve(__dirname, '../dist'),
         }
     }