From b180272b17b7300ea8c7683e8937a56300657851 Mon Sep 17 00:00:00 2001
From: velzie <velzie@velzie.rip>
Date: Wed, 31 Jul 2024 13:14:06 -0400
Subject: [PATCH] percs i swear to god

---
 package.json                 |  6 +++---
 src/shared/rewriters/html.ts |  1 -
 src/worker/fetch.ts          |  2 +-
 src/worker/index.ts          | 16 ++++++++--------
 4 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/package.json b/package.json
index 524b405..b6bab00 100644
--- a/package.json
+++ b/package.json
@@ -28,7 +28,6 @@
 		"@mercuryworkshop/bare-as-module3": "^2.2.2",
 		"@mercuryworkshop/epoxy-transport": "^2.1.5",
 		"@mercuryworkshop/libcurl-transport": "^1.3.7",
-		"wisp-server-node": "^1.1.3",
 		"@rsdoctor/rspack-plugin": "^0.3.7",
 		"@rspack/cli": "^0.7.5",
 		"@rspack/core": "^0.7.5",
@@ -44,18 +43,19 @@
 		"fastify": "^4.26.2",
 		"prettier": "^3.3.3",
 		"tslib": "^2.6.2",
-		"typescript": "^5.4.5"
+		"typescript": "^5.4.5",
+		"wisp-server-node": "^1.1.3"
 	},
 	"type": "module",
 	"dependencies": {
 		"@mercuryworkshop/bare-mux": "^2.0.2",
+		"@webreflection/idb-map": "^0.3.1",
 		"astravel": "^0.6.1",
 		"astring": "^1.8.6",
 		"dom-serializer": "^2.0.0",
 		"domhandler": "^5.0.3",
 		"domutils": "^3.1.0",
 		"htmlparser2": "^9.1.0",
-		"idb-map-entries": "^0.3.2",
 		"meriyah": "^4.4.2",
 		"parse-domain": "^8.0.2",
 		"set-cookie-parser": "^2.6.0"
diff --git a/src/shared/rewriters/html.ts b/src/shared/rewriters/html.ts
index 518aa65..ce82ef5 100644
--- a/src/shared/rewriters/html.ts
+++ b/src/shared/rewriters/html.ts
@@ -102,7 +102,6 @@ function traverseParsedHtml(node, origin?: URL) {
 		const htmlcomment = /<!--[\s\S]*?-->/g;
 		js = js.replace(htmlcomment, "");
 		node.children[0].data = rewriteJs(js, origin);
-		console.log(node.children);
 	}
 	if (node.name === "meta" && hasAttrib(node, "http-equiv")) {
 		if (node.attribs["http-equiv"] === "content-security-policy") {
diff --git a/src/worker/fetch.ts b/src/worker/fetch.ts
index 49d75ce..8a22706 100644
--- a/src/worker/fetch.ts
+++ b/src/worker/fetch.ts
@@ -1,5 +1,5 @@
 import { BareResponseFetch } from "@mercuryworkshop/bare-mux";
-import IDBMap from "idb-map-entries";
+import IDBMap from "@webreflection/idb-map";
 import { ParseResultType } from "parse-domain";
 import { ScramjetServiceWorker } from ".";
 import { renderError } from "./error";
diff --git a/src/worker/index.ts b/src/worker/index.ts
index e2da04a..2e41fd1 100644
--- a/src/worker/index.ts
+++ b/src/worker/index.ts
@@ -1,4 +1,4 @@
-import IDBMap from "idb-map-entries";
+import IDBMap from "@webreflection/idb-map";
 import { FakeServiceWorker } from "./fakesw";
 import { swfetch } from "./fetch";
 import { ScramjetThreadpool } from "./threadpool";
@@ -20,7 +20,6 @@ export class ScramjetServiceWorker {
 	serviceWorkers: FakeServiceWorker[] = [];
 
 	constructor() {
-		this.loadConfig();
 		this.client = new self.$scramjet.shared.util.BareClient();
 
 		this.threadpool = new ScramjetThreadpool();
@@ -46,17 +45,18 @@ export class ScramjetServiceWorker {
 		});
 	}
 
-	loadConfig() {
+	async loadConfig() {
+		if (this.config) return;
+
 		const store = new IDBMap("config", {
 			prefix: "scramjet",
 		});
 
 		if (store.has("config")) {
-			store.get("config").then((config) => {
-				this.config = config;
-				self.$scramjet.config = config;
-				self.$scramjet.codec = self.$scramjet.codecs[config.codec];
-			});
+			const config = await store.get("config");
+			this.config = config;
+			self.$scramjet.config = config;
+			self.$scramjet.codec = self.$scramjet.codecs[config.codec];
 		}
 	}