@remix_labs/machine-starter 1.1890.0-dev → 1.1898.0-dev

package/groovebox_build.js

@@ -1,2 +1,2 @@
-var GROOVEBOX_BUILD = "1890";
+var GROOVEBOX_BUILD = "1898";
 export { GROOVEBOX_BUILD }

package/index.js

@@ -36,19 +36,20 @@ 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 worker;
+        let bundle;
         if (globalThis.ThisIsNode) {
-            worker = new Worker(new URL("./machine-wasm.mjs", import.meta.url));
-        } else {
+            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
-            let baseURL = globalThis.GROOVEBOX_URL_PREFIX || "/g";
-
             // already fire off the download of the wasm code:
-            let code_url = new URL(`${baseURL}/machine-wasm-code.wasm`, window.location.href);
+            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() });
-
-            let bundle = new URL(`${baseURL}/machine-wasm-core.js`, window.location.href);
-            worker = new Worker(bundle);
+            bundle = new URL(`${globalThis.GROOVEBOX_URL_PREFIX}/machine-wasm-core.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-core.js", window.location.href);
         }
         let localFFIs = {};
         if (config.localFFIs) {
@@ -61,6 +62,7 @@ function StartWASM2(hub, config) {
                 }
             }
         }
+        let worker = new Worker(bundle);
         let config_msg =
             { "_rmx_type": "msg_vm_configure",
               "baseURL": config.baseURL,

package/node.js

@@ -1,40 +1,7 @@
+import Worker from "web-worker";
+global.Worker = Worker;
+import WT from "worker_threads";
+global.MessageChannel = WT.MessageChannel;
 import Process from "process";
 global.Process = Process;
-
-// 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 with a URL('./foo.mjs')
-//
-// Other ways to package/load might work, but definitely seems like
-// using worker_threads.Worker directly is needed (rather than through,
-// say, the web-worker packages that wraps either worker_threads.Worker
-// or the browser Worker to give the same interface). Webpack says ESM
-// is necessary but I'm not sure if this is true for either the main
-// script or the workers.
-import { MessageChannel, Worker } from "worker_threads";
-global.Worker = Worker;
-
-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;
-
+export * from "./index.js";

package/package.json

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

package/{start.mjs → start.js}

@@ -1,6 +1,6 @@
 import Process from "process";
-import { StartWASM2, Hub } from "./node.js";
-
+import { StartWASM2 } from "./node.js";
+import * as Hub from "@remix_labs/hub-client";
 if (Process.stdout._handle)
     Process.stdout._handle.setBlocking(true);
 if (Process.stderr._handle)

package/webpack.config.js

@@ -1,39 +0,0 @@
-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: './start.mjs',
-            //'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: 'machine-starter.mjs',
-            library : {
-                type: 'module',
-            },
-            path: path.resolve(__dirname, '../dist'),
-        }
-    }
-]