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

package/groovebox_build.js

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

package/index.js

@@ -38,21 +38,16 @@ function StartWASM2(hub, config) {
     return hub.newChannel().then(channel => {
         let worker;
         if (globalThis.ThisIsNode) {
-            worker = globalThis.getMachineWasmWorker();
+            worker = new Worker(new URL("./machine-wasm.mjs", import.meta.url));
         } else {
-            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-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);
-            }
+            // 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);
+            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);
         }
         let localFFIs = {};

package/node.js

@@ -1,5 +1,3 @@
-import { MessageChannel, Worker } from "worker_threads";
-global.MessageChannel = MessageChannel;
 import Process from "process";
 global.Process = Process;
 
@@ -8,21 +6,16 @@ global.Process = Process;
 // * 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')
+// * 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. Webpack says ESM
+// 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.
-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 { MessageChannel, Worker } from "worker_threads";
+global.Worker = Worker;
 
 import * as Hub from "@remix_labs/hub-client";
 

package/package.json

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