[scramjet/core] abstract data url and blob url fetch handlers

velzie · velzie · commit 34a2090ac8b2 · 2025-10-30T17:14:55.000-04:00
diff --git a/packages/chrome/src/IsolatedFrame.tsx b/packages/chrome/src/IsolatedFrame.tsx
@@ -16,7 +16,11 @@ import {
 import scramjetWASM from "../../scramjet/packages/core/dist/scramjet.wasm.wasm?url";
 import scramjetAll from "../../scramjet/packages/core/dist/scramjet.js?url";
 import injectScript from "../../inject/dist/inject.js?url";
-import { BareClient, type BareHeaders } from "@mercuryworkshop/bare-mux-custom";
+import {
+	BareClient,
+	type BareHeaders,
+	type BareResponseFetch,
+} from "@mercuryworkshop/bare-mux-custom";
 import { ElementType, type Handler, Parser } from "htmlparser2";
 import { type ChildNode, DomHandler, Element, Comment, Node } from "domhandler";
 import * as tldts from "tldts";
@@ -197,35 +201,8 @@ const getInjectScripts: ScramjetInterface["getInjectScripts"] = (
 		script("data:application/javascript;base64," + base64Encode(injected)),
 	];
 };
-setInterface({
-	onServerbound: (type, listener) => {
-		sjIpcListeners.set(type, listener);
-	},
-	sendClientbound: async (type, msg) => {
-		// TODO: the fetchandler needs an abstracted concept of clients so it can manually decide which one to send to
-		for (let tab of browser.tabs) {
-			if (!tab.frame.frame.contentWindow) continue;
-			const token = sjIpcCounter++;
-
-			const recurseSend = (win: Window) => {
-				win.postMessage(
-					{
-						$scramjetipc$type: "request",
-						$scramjetipc$method: type,
-						$scramjetipc$token: token,
-						$scramjetipc$message: msg,
-					},
-					"*"
-				);
-				for (let i = 0; i < win.frames.length; i++) {
-					recurseSend(win.frames[i]);
-				}
-			};
 
-			recurseSend(tab.frame.frame.contentWindow);
-		}
-		return undefined;
-	},
+setInterface({
 	getInjectScripts,
 	getWorkerInjectScripts: (meta, js, config, type) => {
 		const module = type === "module";
@@ -312,6 +289,41 @@ function makeController(url: URL): Controller {
 		client: bare,
 		cookieJar,
 		prefix: prefix,
+		onServerbound: (type, listener) => {
+			sjIpcListeners.set(type, listener);
+		},
+		sendClientbound: async (type, msg) => {
+			// TODO: the fetchandler needs an abstracted concept of clients so it can manually decide which one to send to
+			for (let tab of browser.tabs) {
+				if (!tab.frame.frame.contentWindow) continue;
+				const token = sjIpcCounter++;
+
+				const recurseSend = (win: Window) => {
+					win.postMessage(
+						{
+							$scramjetipc$type: "request",
+							$scramjetipc$method: type,
+							$scramjetipc$token: token,
+							$scramjetipc$message: msg,
+						},
+						"*"
+					);
+					for (let i = 0; i < win.frames.length; i++) {
+						recurseSend(win.frames[i]);
+					}
+				};
+
+				recurseSend(tab.frame.frame.contentWindow);
+			}
+			return undefined;
+		},
+		async fetchDataUrl(dataUrl: string) {
+			return (await fetch(dataUrl)) as BareResponseFetch;
+		},
+		async fetchBlobUrl(blobUrl: string) {
+			console.log("uuhhh");
+			return new Response("hawk tuah") as BareResponseFetch;
+		},
 	});
 
 	const controller = {
diff --git a/packages/scramjet/packages/core/src/fetch/index.ts b/packages/scramjet/packages/core/src/fetch/index.ts
@@ -2,6 +2,7 @@ import {
 	BareClient,
 	BareHeaders,
 	BareResponseFetch,
+	TransferrableResponse,
 } from "@mercuryworkshop/bare-mux-custom";
 
 import { CookieJar } from "@/shared/cookie";
@@ -14,7 +15,7 @@ import {
 } from "@rewriters/url";
 import { rewriteJs } from "@rewriters/js";
 import { ScramjetHeaders } from "@/shared/headers";
-import { config, flagEnabled, iface } from "@/shared";
+import { Clientbound, config, flagEnabled, iface, Serverbound } from "@/shared";
 import { rewriteHtml } from "@rewriters/html";
 import { rewriteCss } from "@rewriters/css";
 import { rewriteWorkers } from "@rewriters/worker";
@@ -57,6 +58,17 @@ export type FetchHandler = {
 	cookieJar: CookieJar;
 	crossOriginIsolated?: boolean;
 	prefix: URL;
+
+	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;
+	fetchDataUrl(dataUrl: string): Promise<BareResponseFetch>;
+	fetchBlobUrl(blobUrl: string): Promise<BareResponseFetch>;
 };
 
 export class ScramjetFetchHandler extends EventTarget {
@@ -65,14 +77,25 @@ export class ScramjetFetchHandler extends EventTarget {
 	public crossOriginIsolated: boolean = false;
 	public prefix: URL;
 
+	public sendClientbound: <K extends keyof Clientbound>(
+		type: K,
+		msg: Clientbound[K][0]
+	) => Promise<Clientbound[K][1]>;
+
+	public fetchDataUrl: (dataUrl: string) => Promise<BareResponseFetch>;
+	public fetchBlobUrl: (blobUrl: string) => Promise<BareResponseFetch>;
+
 	constructor(init: FetchHandler) {
 		super();
 		this.client = init.client;
 		this.cookieJar = init.cookieJar;
 		this.crossOriginIsolated = init.crossOriginIsolated || false;
 		this.prefix = init.prefix;
+		this.sendClientbound = init.sendClientbound;
+		this.fetchDataUrl = init.fetchDataUrl;
+		this.fetchBlobUrl = init.fetchBlobUrl;
 
-		iface.onServerbound("setCookie", ({ cookie, url }) => {
+		init.onServerbound("setCookie", ({ cookie, url }) => {
 			console.log("recv'd cookies");
 			this.cookieJar.setCookies([cookie], new URL(url));
 
@@ -387,12 +410,18 @@ async function handleBlobOrDataUrlFetch(
 	parsed: ScramjetFetchParsed
 ): Promise<ScramjetFetchResponse> {
 	let dataUrl = context.rawUrl.pathname.substring(config.prefix.length);
+	let response: BareResponseFetch;
+
 	if (dataUrl.startsWith("blob:")) {
 		dataUrl = unrewriteBlob(dataUrl, parsed.meta);
+		response = await handler.fetchBlobUrl(dataUrl);
+	} else {
+		response = await handler.fetchDataUrl(dataUrl);
 	}
-	const response: Partial<BareResponseFetch> = await fetch(dataUrl, {});
+
 	const url = dataUrl.startsWith("blob:") ? dataUrl : "(data url)";
 	response.finalURL = url;
+
 	let body: BodyType;
 	if (response.body) {
 		body = await rewriteBody(
@@ -415,66 +444,6 @@ async function handleBlobOrDataUrlFetch(
 		headers: headers,
 	};
 }
-// async function handleDownload(
-// 	context: ScramjetFetchContext,
-// 	parsed: ScramjetFetchParsed
-// ) {
-// 	if (flagEnabled("interceptDownloads", parsed.url)) {
-// 		if (!client) {
-// 			throw new Error("cant find client");
-// 		}
-// 		let filename: string | null = null;
-// 		const disp = responseHeaders["content-disposition"];
-// 		if (typeof disp === "string") {
-// 			const filenameMatch = disp.match(/filename=["']?([^"';\n]*)["']?/i);
-// 			if (filenameMatch && filenameMatch[1]) {
-// 				filename = filenameMatch[1];
-// 			}
-// 		}
-// 		const length = responseHeaders["content-length"];
-// 		// there's no reliable way of finding the top level client that made the request
-// 		// just take the first one and hope
-// 		let clis = await clients.matchAll({
-// 			type: "window",
-// 		});
-// 		// only want controller windows
-// 		clis = clis.filter((e) => !e.url.includes(config.prefix));
-// 		if (clis.length < 1) {
-// 			throw Error("couldn't find a controller client to dispatch download to");
-// 		}
-// 		const download: ScramjetDownload = {
-// 			filename,
-// 			url: url.href,
-// 			type: responseHeaders["content-type"],
-// 			body: response.body,
-// 			length: Number(length),
-// 		};
-// 		clis[0].postMessage(
-// 			{
-// 				scramjet$type: "download",
-// 				download,
-// 			} as MessageW2C,
-// 			[response.body]
-// 		);
-// 		// endless vortex reference
-// 		await new Promise(() => {});
-// 	} else {
-// 		// manually rewrite for regular browser download
-// 		const header = responseHeaders["content-disposition"];
-// 		// validate header and test for filename
-// 		if (!/\s*?((inline|attachment);\s*?)filename=/i.test(header)) {
-// 			// if filename= wasn"t specified then maybe the remote specified to download this as an attachment?
-// 			// if it"s invalid then we can still possibly test for the attachment/inline type
-// 			const type = /^\s*?attachment/i.test(header) ? "attachment" : "inline";
-// 			// set the filename
-// 			const [filename] = new URL(response.finalURL).pathname
-// 				.split("/")
-// 				.slice(-1);
-// 			responseHeaders["content-disposition"] =
-// 				`${type}; filename=${JSON.stringify(filename)}`;
-// 		}
-// 	}
-// }
 
 async function handleCookies(
 	context: ScramjetFetchContext,
diff --git a/packages/scramjet/packages/core/src/shared/index.ts b/packages/scramjet/packages/core/src/shared/index.ts
@@ -75,14 +75,6 @@ export type ScramjetInterface = {
 		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;
 	getInjectScripts(
 		meta: URLMeta,
 		handler: DomHandler,
