@remix_labs/machine-starter 2.2934.0 → 2.2937.0-dev

package/common.js

@@ -56,6 +56,8 @@ globalThis.MixSetMask = (m => {
     }
 });
 
+const DEBUG_STATE = 4;
+
 function StartWASM(hub, baseURL, org, workspace, vmID, user, token, noOutputViaMQTT) {
     return StartWASM2(hub, {
         baseURL: baseURL,
@@ -294,10 +296,12 @@ async function localFFIsMessageLoop(hub, config, localFFIs, terminate) {
             return;
         }
         let name = msg.payload.name;
-        let call_id = msg.payload.call_id;
+        let call_id = msg.payload.callID;
         let args = decode(msg.payload.args);
         let fun = localFFIs[name];
-        console.log("[groovebox-starter] local FFI call", vmID, call_id, name);
+        if (initialMask & DEBUG_STATE) {
+            console.debug("[groovebox-starter] local FFI call", vmID, call_id, name);
+        };
         try {
             if (!fun) throw new Error("No such local FFI in groovebox starter: " + name);
             let connector =
@@ -310,13 +314,26 @@ async function localFFIsMessageLoop(hub, config, localFFIs, terminate) {
             let r = fun instanceof Function ? fun(connector, args) : fun.run(connector, args);
             if (r instanceof Promise) {
                 // r.catch(_ => null);  // prevent "unhandled rejection"
+                if (initialMask & DEBUG_STATE) {
+                    console.debug("[groovebox-starter] running FFI call asynchronously", vmID, call_id, name);
+                }
                 await comm.later(call_id);
                 let value = await r;
+                if (initialMask & DEBUG_STATE) {
+                    console.debug("[groovebox-starter] async FFI call returned", vmID, call_id, name);
+                };
                 await comm.returnOrFail(fun, call_id, value);
             } else {
+                if (initialMask & DEBUG_STATE) {
+                    console.debug("[groovebox-starter] sync FFI call returned", vmID, call_id, name);
+                };
                 await comm.returnOrFail(fun, call_id, r);
             }
         } catch (reason) {
+            if (initialMask & DEBUG_STATE) {
+                console.debug("[groovebox-starter] FFI call exception", vmID, call_id, name);
+                console.debug("[groovebox-starter] exception", reason);
+            };
             await comm.error(call_id, reason.message, reason.stack);
         }
     }
@@ -330,14 +347,14 @@ class FFIComm {
     }
     later(call_id) {
         let r_payload =
-            { call_id: call_id,
+            { callID: call_id,
             };
         let response = this.hub.newLocalMessage("msg_ffi_later", "starter", r_payload);
         return this.channel.publish("/local/" + this.vmID + "/ffi/return", response, false);
     }
     return_(fun, call_id, result) {
         let r_payload =
-            { call_id: call_id,
+            { callID: call_id,
               value: fun.useJsonDecoder ? result : encode(result)
             };
         let response = this.hub.newLocalMessage("msg_ffi_return", "starter", r_payload);
@@ -345,7 +362,7 @@ class FFIComm {
     }
     error(call_id, message, stack) {
         let r_payload =
-            { call_id: call_id,
+            { callID: call_id,
               message: message,
               stack: stack === undefined ? [] : stack,
             };

package/groovebox_build.js

@@ -1,2 +1,2 @@
-var GROOVEBOX_BUILD = "3231";
+var GROOVEBOX_BUILD = "3236";
 export { GROOVEBOX_BUILD }

package/node.js

@@ -1,5 +1,9 @@
 import Process from "process";
+import Console from "console"
 globalThis.Process = Process;
+globalThis.console = new Console.Console({stdout: process.stderr, stderr: process.stderr });
+// redirect stdout to stderr to avoid that log messages appear in the wrong
+// order
 
 // NB: The only way I've made this work in node+webpack is if:
 //

package/package.json

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

package/webpack.config.js

@@ -18,6 +18,10 @@ export default [
         experiments: {
             outputModule: true
         },
+	externalsType: 'node-commonjs',
+	externals: {
+	    "console": "node:console"
+	},
         output: {
             chunkFormat: 'module',
             filename: 'machine-starter.mjs',