refactor fetch handler to a class and implement structures for abstract ipc

Author: velzie

packages/chrome/package.json

@@ -18,7 +18,7 @@
 		"@mercuryworkshop/bare-mux-custom": "workspace:*",
 		"@mercuryworkshop/epoxy-transport": "workspace:*",
 		"@mercuryworkshop/libcurl-transport": "workspace:*",
-		"@mercuryworkshop/scramjet": "workspace:scramjet",
+		"@mercuryworkshop/scramjet": "workspace:*",
 		"devtools-protocol": "^0.0.1339468",
 		"domhandler": "^5.0.3",
 		"dreamland": "workspace:dreamland",

packages/chrome/src/IsolatedFrame.tsx

@@ -3,13 +3,14 @@ import {
 	type ScramjetFetchContext,
 	type ScramjetFetchResponse,
 	CookieJar,
-	handleFetch,
+	ScramjetFetchHandler,
 	rewriteUrl,
 	setConfig,
 	unrewriteUrl,
 	type URLMeta,
-	ScramjetServiceWorker,
+	setInterface,
 } from "@mercuryworkshop/scramjet/bundled";
+
 import { BareClient } from "@mercuryworkshop/bare-mux-custom";
 import { ElementType, type Handler, Parser } from "htmlparser2";
 import { type ChildNode, DomHandler, Element, Comment, Node } from "domhandler";
@@ -86,6 +87,12 @@ const cfg = {
 };
 
 setConfig(cfg);
+setInterface({
+	onServerbound: (type, fn) => {},
+	onClientbound: (type, fn) => {},
+	sendClientbound: (type, message) => {},
+	sendServerbound: (type, message) => {},
+});
 export const bare = new BareClient(
 	new LibcurlClient({
 		wisp: cfg.wisp,
@@ -94,7 +101,8 @@ export const bare = new BareClient(
 
 type Controller = {
 	controllerframe: HTMLIFrameElement;
-	cookiestore: CookieJar;
+	cookieJar: CookieJar;
+	fetchHandler: ScramjetFetchHandler;
 	rootdomain: string;
 	baseurl: URL;
 	prefix: URL;
@@ -139,7 +147,33 @@ function makeController(url: URL): Controller {
 	});
 
 	const prefix = new URL(baseurl.protocol + baseurl.host + cfg.prefix);
-	const cookiestore = new CookieJar();
+	const cookieJar = new CookieJar();
+
+	const fetchHandler = new ScramjetFetchHandler({
+		client: bare,
+		cookieJar,
+		prefix: prefix,
+	});
+	fetchHandler.addEventListener("htmlPostRewrite", (e: any) => {
+		const handler = e.handler as DomHandler;
+		function findhead(node: Element): Element | null {
+			if (node.type === ElementType.Tag && node.name === "head") {
+				return node as Element;
+			} else if (node.childNodes) {
+				for (const child of node.childNodes) {
+					const head = findhead(child as Element);
+					if (head) return head;
+				}
+			}
+
+			return null;
+		}
+
+		const head = findhead(handler.root as Node as Element)!;
+
+		// inject after the scramjet scripts and before the rest of the page
+		head.children.splice(3, 0, new Element("script", { src: inject_script }));
+	});
 
 	const controller = {
 		controllerframe: frame,
@@ -149,7 +183,8 @@ function makeController(url: URL): Controller {
 		prefix,
 		ready,
 		readyResolve: readyResolve!,
-		cookiestore,
+		cookieJar,
+		fetchHandler,
 	};
 	controllers.push(controller);
 
@@ -190,7 +225,7 @@ const methods = {
 		controller: Controller
 	): Promise<[ScramjetFetchResponse, Transferable[] | undefined]> {
 		// repopulate fetchcontext fields with the items that weren't cloned over postMessage
-		data.cookieStore = controller.cookiestore;
+		data.cookieStore = controller.cookieJar;
 		data.rawUrl = new URL(data.rawUrl);
 		if (data.rawClientUrl) data.rawClientUrl = new URL(data.rawClientUrl);
 		let headers = new ScramjetHeaders();
@@ -257,36 +292,7 @@ const methods = {
 			}
 		}
 
-		// TODO fix eventtarget jank
-		const tgt = new EventTarget();
-		tgt.addEventListener("htmlPostRewrite", (e: any) => {
-			const handler = e.handler as DomHandler;
-			function findhead(node: Element): Element | null {
-				if (node.type === ElementType.Tag && node.name === "head") {
-					return node as Element;
-				} else if (node.childNodes) {
-					for (const child of node.childNodes) {
-						const head = findhead(child as Element);
-						if (head) return head;
-					}
-				}
-
-				return null;
-			}
-
-			const head = findhead(handler.root as Node as Element)!;
-
-			// inject after the scramjet scripts and before the rest of the page
-			head.children.splice(3, 0, new Element("script", { src: inject_script }));
-		});
-
-		const fetchresponse = await handleFetch.call(
-			tgt as any,
-			data,
-			cfg,
-			bare,
-			controller.prefix
-		);
+		const fetchresponse = await controller.fetchHandler.handleFetch(data);
 
 		let transfer: any[] | undefined = undefined;
 		if (

packages/chrome/src/Tab.tsx

@@ -4,22 +4,12 @@ import { browser } from "./Browser";
 import { History, type SerializedHistory } from "./History";
 import { NewTabPage } from "./pages/NewTabPage";
 import { PlaygroundPage } from "./pages/PlaygroundPage";
-import { createMenu } from "./components/Menu";
 import { AboutPage } from "./pages/AboutPage";
 import { HistoryPage } from "./pages/HistoryPage";
 import { SettingsPage } from "./pages/SettingsPage";
 import { serviceWorkerReady } from "./main";
 import { DownloadsPage } from "./pages/DownloadsPage";
 import {
-	ScramjetHeaders,
-	ScramjetServiceWorker,
-	type ScramjetInitConfig,
-	type ScramjetFetchContext,
-	ScramjetController,
-	type ScramjetFetchResponse,
-	handleFetch,
-	rewriteUrl,
-	config,
 	ScramjetClient,
 	ScramjetFrame,
 } from "@mercuryworkshop/scramjet/bundled";

packages/scramjet/src/client/dom/cookie.ts

@@ -1,40 +1,22 @@
+import { iface } from "@/shared";
 import type { MessageC2W, MessageW2C } from "@/worker";
 import { ScramjetClient } from "@client/index";
 
 export default function (client: ScramjetClient, self: typeof window) {
-	client.serviceWorker.addEventListener(
-		"message",
-		({ data }: { data: MessageW2C }) => {
-			if (!("scramjet$type" in data)) return;
-
-			if (data.scramjet$type === "cookie") {
-				client.cookieStore.setCookies([data.cookie], new URL(data.url));
-				const msg = {
-					scramjet$token: data.scramjet$token,
-					scramjet$type: "cookie",
-				};
-				client.serviceWorker.controller.postMessage(msg);
-			}
-		}
-	);
+	iface.onClientbound("setCookie", ({ cookie, url }) => {
+		client.cookieStore.setCookies([cookie], new URL(url));
+		return undefined;
+	});
 
 	client.Trap("Document.prototype.cookie", {
 		get() {
 			return client.cookieStore.getCookies(client.url, true);
 		},
 		set(ctx, value: string) {
-			client.cookieStore.setCookies([value], client.url);
-			const controller = client.descriptors.get(
-				"ServiceWorkerContainer.prototype.controller",
-				client.serviceWorker
-			);
-			if (controller) {
-				client.natives.call("ServiceWorker.prototype.postMessage", controller, {
-					scramjet$type: "cookie",
-					cookie: value,
-					url: client.url.href,
-				});
-			}
+			iface.sendServerbound("setCookie", {
+				cookie: value,
+				url: client.url.href,
+			});
 		},
 	});
 

packages/scramjet/src/shared/index.ts

@@ -38,3 +38,51 @@ export let bareTransport: BareTransport | null = null;
 export function setBareTransport(transport: BareTransport) {
 	bareTransport = transport;
 }
+
+export type Clientbound = {
+	setCookie: [
+		{
+			cookie: string;
+			url: string;
+		},
+	];
+};
+
+export type Serverbound = {
+	setCookie: [
+		{
+			cookie: string;
+			url: string;
+		},
+	];
+	blobData: [
+		{
+			id: string;
+			data: Blob;
+		},
+	];
+};
+
+export type ScramjetInterface = {
+	sendServerbound<K extends keyof Serverbound>(
+		type: K,
+		msg: Serverbound[K][0]
+	): Promise<Serverbound[K][1]>;
+	onClientbound<K extends keyof Clientbound>(
+		type: K,
+		listener: (msg: Clientbound[K][0]) => Promise<Clientbound[K][1]>
+	): () => void;
+	sendClientbound<K extends keyof Clientbound>(
+		type: K,
+		msg: Clientbound[K][0]
+	): Promise<Clientbound[K][1]>;
+	onServerbound<K extends keyof Serverbound>(
+		type: K,
+		listener: (msg: Serverbound[K][0]) => Promise<Serverbound[K][1]>
+	): () => void;
+};
+
+export let iface: ScramjetInterface = null!;
+export function setInterface(newIface: ScramjetInterface) {
+	iface = newIface;
+}