@remix_labs/hub-client 1.1874.0-dev → 1.1880.0-dev

package/index.js

@@ -434,41 +434,54 @@ class Channel {
 // once.
 class Worker {
     constructor() {
+        console.log("building worker");
         if (globalThis.RmxMessagingHub) {
+            console.log("worker: global hub exists");
             this.worker = globalThis.RmxMessagingHub.worker;
             this.expect = globalThis.RmxMessagingHub.expect;
             this.noreconfigure = true;
             return;
         };
-        let bundle;
         if (globalThis.ThisIsNode) {
-            bundle = new URL("../../hub-worker/src/node.js", import.meta.url);
-        } else if (globalThis.GROOVEBOX_URL_PREFIX) {
-            // FIXME: Stopgap solution until we figure out a way to bundle groovebox correctly
-            bundle = new URL(`${globalThis.GROOVEBOX_URL_PREFIX}/hub-worker.js`, window.location.href);
+            this.worker = globalThis.getHubWorker();
+            //this.worker = new globalThis.Worker(new URL("./hub-worker.js", import.meta.url));
+            console.log("made a worker for hub-worker");
         } else {
-            bundle = new URL("/g/hub-worker.js", window.location.href);
+            let bundle;
+            if (globalThis.GROOVEBOX_URL_PREFIX) {
+                // FIXME: Stopgap solution until we figure out a way to bundle groovebox correctly
+                bundle = new URL(`${globalThis.GROOVEBOX_URL_PREFIX}/hub-worker.js`, window.location.href);
+            } else {
+                bundle = new URL("/g/hub-worker.js", window.location.href);
+            }
+            this.worker = new globalThis.Worker(bundle);
         }
-        this.worker = new globalThis.Worker(bundle);
         globalThis.RmxMessagingHub = this;
         let thisworker = this;
         this.expect = new Array(0);
-        this.worker.onmessage = (ev => {
+        // TODO: does this work on web, too?
+        this.worker.on("message", (ev => {
+            console.log("hub-client got message");
             let f = thisworker.expect.shift();
-            f(ev)
-        });
+            f(ev);
+            console.log("hub-client handled message");
+        }));
+
         this.noreconfigure = false;
         terminate(() => thisworker.worker.terminate());
     }
 
     configure(config_obj) {
+        console.log("worker.configure");
         if (this.noreconfigure) {
             console.warn("The global hub-client is already configured");
             return;
         };
         let thisworker = this;
         return new Promise((resolve, reject) => {
+            console.log("in promise");
             thisworker.expect.push(resp => {
+                console.log("in expect.push callback");
                 if (resp.data.error == null)
                     resolve(resp.data);
                 else
@@ -482,7 +495,9 @@ class Worker {
                   "token": config_obj.token,
                   "standalone": config_obj.standalone === true
                 };
+            console.log("posting msg");
             thisworker.worker.postMessage(config_msg);
+            console.log("posted msg");
         })
     }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@remix_labs/hub-client",
-  "version": "1.1874.0-dev",
+  "version": "1.1880.0-dev",
   "description": "talk to the Hub web worker",
   "main": "node.js",
   "browser": "index.js",
@@ -11,7 +11,7 @@
   "author": "Remixlabs staff",
   "license": "ISC",
   "dependencies": {
-    "@remix_labs/web-worker-onlymain": "1.1874.0-dev"
+    "@remix_labs/web-worker-onlymain": "1.1880.0-dev"
   },
   "repository": "https://github.com/remixlabs/groovebox.git"
 }