@remix_labs/machine-starter 1.1874.0-dev → 1.1880.0-dev

package/groovebox_build.js

@@ -1,2 +1,2 @@
-var GROOVEBOX_BUILD = "1874";
+var GROOVEBOX_BUILD = "1880";
 export { GROOVEBOX_BUILD }

package/index.js

@@ -36,20 +36,27 @@ function StartWASM(hub, baseURL, org, workspace, vmID, user, token, noOutputViaM
 function StartWASM2(hub, config) {
     console.log("GROOVEBOX_BUILD (machine-starter)", GROOVEBOX_BUILD);
     return hub.newChannel().then(channel => {
-        let bundle;
+        let worker;
         if (globalThis.ThisIsNode) {
-            bundle = new URL("../../machine-wasm/dist/node-bundle.js", import.meta.url);
-        } else if (globalThis.GROOVEBOX_URL_PREFIX) {
-            // FIXME: Stopgap solution until we figure out a way to bundle groovebox correctly
-            // already fire off the download of the wasm code:
-            let code_url = new URL(`${globalThis.GROOVEBOX_URL_PREFIX}/machine-wasm-code.wasm`, window.location.href);
-            fetch(code_url, {cache:"default"}).then(resp => { return resp.arrayBuffer() });
-            bundle = new URL(`${globalThis.GROOVEBOX_URL_PREFIX}/machine-wasm-core.js`, window.location.href);
+            console.log("loading node bundle")
+            //bundle = new URL("file:///Users/verm/remix/harmony/components/groovebox/machine-wasm/dist/node-bundle.js");
+            worker = globalThis.getMachineWasmWorker();
         } else {
-            // already fire off the download of the wasm code:
-            let code_url = new URL("/g/machine-wasm-code.wasm", window.location.href);
-            fetch(code_url, {cache:"default"}).then(resp => { return resp.arrayBuffer() });
-            bundle = new URL("/g/machine-wasm-core.js", window.location.href);
+            console.log("non-node bundle");
+            let bundle;
+            if (globalThis.GROOVEBOX_URL_PREFIX) {
+                // FIXME: Stopgap solution until we figure out a way to bundle groovebox correctly
+                // already fire off the download of the wasm code:
+                let code_url = new URL(`${globalThis.GROOVEBOX_URL_PREFIX}/machine-wasm-code.wasm`, window.location.href);
+                fetch(code_url, {cache:"default"}).then(resp => { return resp.arrayBuffer() });
+                bundle = new URL(`${globalThis.GROOVEBOX_URL_PREFIX}/machine-wasm.js`, window.location.href);
+            } else {
+                // already fire off the download of the wasm code:
+                let code_url = new URL("/g/machine-wasm-code.wasm", window.location.href);
+                fetch(code_url, {cache:"default"}).then(resp => { return resp.arrayBuffer() });
+                bundle = new URL("/g/machine-wasm.js", window.location.href);
+            }
+            worker = new Worker(bundle);
         }
         let localFFIs = {};
         if (config.localFFIs) {
@@ -62,7 +69,6 @@ function StartWASM2(hub, config) {
                 }
             }
         }
-        let worker = new Worker(bundle);
         let config_msg =
             { "_rmx_type": "msg_vm_configure",
               "baseURL": config.baseURL,

package/node.js

@@ -1,7 +1,49 @@
-import Worker from "web-worker";
-global.Worker = Worker;
-import WT from "worker_threads";
-global.MessageChannel = WT.MessageChannel;
+//import Worker from "web-worker";
+//global.Worker = Worker;
+import { MessageChannel, Worker } from "worker_threads";
+global.MessageChannel = MessageChannel;
 import Process from "process";
 global.Process = Process;
-export * from "./index.js";
+
+// NB: The only way I've made this work in node+webpack is if:
+//
+// * we use Worker from worker_threads directly
+// * we build each worker's module with webpack as an ESM .mjs bundle
+// * we put all the bundles in one directory
+// * we load the worker as below with a URL('./foo.mjs')
+//
+// Other ways to package/load might work, but definitely seems like
+// using worker_threads.Worker directly is needed. Webpack says ESM
+// is necessary but I'm not sure if this is true for either the main
+// script or the workers.
+global.getHubWorker = () => {
+    console.log(`getting hub-worker worker`);
+    return new Worker(new URL("./hub-worker.mjs", import.meta.url))
+}
+
+global.getMachineWasmWorker = () => {
+    console.log("getting machine-wasm worker");
+    return new Worker(new URL("./machine-wasm.mjs", import.meta.url))
+}
+
+import * as Hub from "@remix_labs/hub-client";
+
+import { fileURLToPath } from 'url';
+global.__filename = fileURLToPath(import.meta.url);
+
+import { CreateVMID, StartWASM, StartWASM2,
+         Token, Case, Opaque
+       } from "./index.js";
+
+export { CreateVMID, StartWASM, StartWASM2,
+         Token, Case, Opaque, Hub
+       }
+
+global.CreateVMID = CreateVMID;
+global.StartWASM2 = StartWASM2;
+global.StartWASM = StartWASM;
+global.Token = Token;
+global.Case = Case;
+global.Opaque = Opaque;
+global.Hub = Hub;
+

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@remix_labs/machine-starter",
-  "version": "1.1874.0-dev",
+  "version": "1.1880.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": "1.1874.0-dev",
+    "@remix_labs/hub-client": "1.1880.0-dev",
     "nanoid": "^3.1.12",
     "web-worker": "^1.2.0"
   },

package/{start.js → start.mjs}

@@ -1,6 +1,14 @@
+//import { fileURLToPath } from 'url';
+//const __filename = fileURLToPath(import.meta.url);
+
 import Process from "process";
-import { StartWASM2 } from "./node.js";
-import * as Hub from "@remix_labs/hub-client";
+import * as Starter from "./node.mjs";
+//import { StartWASM2 } from "../dist/node.js";
+//import * as Hub from "@remix_labs/hub-client";
+
+StartWASM2 = Starter.StartWASM2;
+Hub = Starter.Hub;
+
 if (Process.stdout._handle)
     Process.stdout._handle.setBlocking(true);
 if (Process.stderr._handle)

package/webpack.config.js

@@ -0,0 +1,39 @@
+import path from 'path';
+
+import {fileURLToPath} from 'url'
+const __filename = fileURLToPath(import.meta.url);
+const __dirname = path.dirname(__filename);
+
+export default [
+    {
+        target: 'node',
+        mode: "production",
+        entry: {
+            node: './node.js',
+            //'hub-worker': './hub-worker.js',
+            //'machine-wasm': './machine-wasm.js',
+        },
+        optimization: {
+            minimize: false,
+        },
+        module: {
+            rules: [
+                {
+                    test: /\.js$/,
+                    loader: '@open-wc/webpack-import-meta-loader'
+                }
+            ]
+        },
+        experiments: {
+            outputModule: true
+        },
+        output: {
+            chunkFormat: 'module',
+            filename: '[name].mjs',
+            library : {
+                type: 'module',
+            },
+            path: path.resolve(__dirname, '../dist'),
+        }
+    }
+]