From e9ba8eb952e9455d1e59233c2ff70c33bf9fa89c Mon Sep 17 00:00:00 2001
From: Percs <83934299+Percslol@users.noreply.github.com>
Date: Mon, 30 Dec 2024 04:28:47 -0600
Subject: [PATCH] make scramjet.init not register service worker

---
 package.json         |  1 +
 rspack.config.js     |  2 +-
 server.js            | 12 ++----------
 static/playground.js |  3 ++-
 static/sw.js         | 10 ++--------
 static/ui.js         |  3 ++-
 6 files changed, 10 insertions(+), 21 deletions(-)

diff --git a/package.json b/package.json
index 8f2c3e0..09ce1ea 100644
--- a/package.json
+++ b/package.json
@@ -13,6 +13,7 @@
 		"build": "rspack build --mode production",
 		"rewriter:build": "cd rewriter/wasm/ && bash build.sh && cd ../../",
 		"dev": "node server.js",
+		"dev:debug": "DEBUG=1 node server.js",
 		"prepack": "RELEASE=1 npm run rewriter:build && npm run build",
 		"pub": "npm publish --no-git-checks --access public",
 		"format": "prettier --config .prettierrc.js --write .",
diff --git a/rspack.config.js b/rspack.config.js
index b95436b..a018069 100644
--- a/rspack.config.js
+++ b/rspack.config.js
@@ -79,7 +79,7 @@ export default defineConfig({
 				}
 			})(),
 		}),
-		process.env.DEBUG === "true"
+		process.env.DEBUG
 			? new RsdoctorRspackPlugin({
 					supports: {
 						parseBundle: true,
diff --git a/server.js b/server.js
index cc39f7c..2da5252 100644
--- a/server.js
+++ b/server.js
@@ -94,16 +94,8 @@ if (!process.env.CI) {
 		chmodSync(".git/hooks/pre-commit", 0o755);
 	} catch {}
 
-	const watch = spawn("pnpm", ["rspack", "-w"], {
-		detached: true,
+	spawn("pnpm", ["rspack", "-w"], {
+		stdio: "inherit",
 		cwd: process.cwd(),
 	});
-
-	watch.stdout.on("data", (data) => {
-		console.log(`${data}`);
-	});
-
-	watch.stderr.on("data", (data) => {
-		console.log(`${data}`);
-	});
 }
diff --git a/static/playground.js b/static/playground.js
index 3f169fc..0edf1d2 100644
--- a/static/playground.js
+++ b/static/playground.js
@@ -13,7 +13,8 @@ const scramjet = new ScramjetController({
 	},
 });
 
-scramjet.init("./sw.js");
+scramjet.init();
+navigator.serviceWorker.register("./sw.js");
 
 const connection = new BareMux.BareMuxConnection("/baremux/worker.js");
 const flex = css`
diff --git a/static/sw.js b/static/sw.js
index 8daf1f4..d1f758b 100644
--- a/static/sw.js
+++ b/static/sw.js
@@ -14,17 +14,11 @@ importScripts(
 
 const scramjet = new ScramjetServiceWorker();
 
-async function handleRequest(event) {
+self.addEventListener("fetch", async (event) => {
 	await scramjet.loadConfig();
 	if (scramjet.route(event)) {
-		return scramjet.fetch(event);
+		event.respondWith(scramjet.fetch(event));
 	}
-
-	return fetch(event.request);
-}
-
-self.addEventListener("fetch", (event) => {
-	event.respondWith(handleRequest(event));
 });
 
 let playgroundData;
diff --git a/static/ui.js b/static/ui.js
index 41940d9..a3e7e1c 100644
--- a/static/ui.js
+++ b/static/ui.js
@@ -13,7 +13,8 @@ const scramjet = new ScramjetController({
 	},
 });
 
-scramjet.init("./sw.js");
+scramjet.init();
+navigator.serviceWorker.register("./sw.js");
 
 const connection = new BareMux.BareMuxConnection("/baremux/worker.js");
 const flex = css`