fix dumb regressiobn

sheplol · Aug 27, 2024 · b243e43 · b243e43
1 parent 074efd6
commit b243e43
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 43 deletions.
diff --git a/src/client/worker.js b/src/client/worker.js
@@ -1,6 +1,5 @@
 import EventEmitter from 'events';
 import HookEvent from './hook.js';
-import { BareMuxConnection } from "@mercuryworkshop/bare-mux";
 
 /**
  * @typedef {import('./index').default} UVClient
@@ -34,20 +33,10 @@ class Workers extends EventEmitter {
                 const event = new HookEvent({ url, options }, target, that);
                 this.emit('worker', event);
 
-				let worker;
-                if (event.intercepted) {
-					worker = event.returnValue;
-				} else {
-					worker = new event.target(
-						...[event.data.url, event.data.options]
-					);
-				}
-				const conn = new BareMuxConnection();
-				(async ()=>{
-					const port = await conn.getInnerPort();
-					worker.postMessage(port, [port]);
-				})();
-				return worker;
+                if (event.intercepted) return event.returnValue;
+                return new event.target(
+                    ...[event.data.url, event.data.options]
+                );
             },
             true
         );

diff --git a/src/uv.handler.js b/src/uv.handler.js
@@ -28,30 +28,12 @@ if (!self.__uv) __uvHook(self);
 
 self.__uvHook = __uvHook;
 
-function __uvHook(window) {
-	if (!window.window) {
-		window.__uv$promise = new Promise(resolve => {
-			window.onmessage = (e)=>{
-				if (e.data.__data instanceof MessagePort) {
-					__uvHookReal(window, new Ultraviolet.BareClient(e.data.__data));
-					delete window.onmessage;
-					resolve();
-				} else {
-					throw new Error("unreachable: e.data !== MessagePort");
-				}
-			}
-		});
-	} else {
-		__uvHookReal(window, new Ultraviolet.BareClient());
-	}
-}
-
 /**
  *
  * @param {typeof globalThis} window
  * @returns
  */
-function __uvHookReal(window, bareClient) {
+function __uvHook(window) {
     if ('__uv' in window && window.__uv instanceof Ultraviolet) return false;
 
     if (window.document && !!window.window) {
@@ -68,6 +50,9 @@ function __uvHookReal(window, bareClient) {
     /*if (typeof config.construct === 'function') {
         config.construct(__uv, worker ? 'worker' : 'window');
     }*/
+
+    // websockets
+    const bareClient = new Ultraviolet.BareClient();
 
     const client = new UVClient(window, bareClient, worker);
     const {

diff --git a/src/uv.sw.js b/src/uv.sw.js
@@ -215,18 +215,20 @@ class UVServiceWorker extends Ultraviolet.EventEmitter {
                             ]
                                 .map((script) => JSON.stringify(script))
                                 .join(',');
-                            responseCtx.body = `(async ()=>{${ultraviolet.createJsInject(
-                                ultraviolet.cookie.serialize(
-                                    cookies,
-                                    ultraviolet.meta,
-                                    true
-                                ),
-                                request.referrer
-                            )} importScripts(${scripts}); await __uv$promise;\n`;
+                            responseCtx.body = `if (!self.__uv) {
+                                ${ultraviolet.createJsInject(
+                                    ultraviolet.cookie.serialize(
+                                        cookies,
+                                        ultraviolet.meta,
+                                        true
+                                    ),
+                                    request.referrer
+                                )}
+                            importScripts(${scripts});
+                            }\n`;
                             responseCtx.body += ultraviolet.js.rewrite(
                                 await response.text()
                             );
-							responseCtx.body += "\n})()";
                         }
                         break;
                     case 'style':