[scramjet] make getInjectScripts be provided by consumer

Author: velzie

packages/scramjet/src/client/entry.ts

@@ -1,10 +1,17 @@
 // entrypoint for scramjet.client.js
 
-import { loadCodecs, setConfig } from "@/shared/index";
+import {
+	loadCodecs,
+	ScramjetInterface,
+	setBareTransport,
+	setConfig,
+	setInterface,
+} from "@/shared/index";
 import { SCRAMJETCLIENT } from "@/symbols";
 import { ScramjetClient } from "@client/index";
 import { ScramjetContextEvent, UrlChangeEvent } from "@client/events";
 import { ScramjetConfig } from "@/types";
+import { BareTransport } from "@mercuryworkshop/bare-mux-custom";
 
 export const iswindow = "window" in globalThis && window instanceof Window;
 export const isworker = "WorkerGlobalScope" in globalThis;
@@ -19,8 +26,16 @@ function createFrameId() {
 		.join("")}`;
 }
 
-export function loadAndHook(config: ScramjetConfig) {
-	setConfig(config);
+export type ScramjetClientEntryInit = {
+	config: ScramjetConfig;
+	interface: ScramjetInterface;
+	transport: BareTransport;
+};
+export function loadAndHook(init: ScramjetClientEntryInit) {
+	setConfig(init.config);
+	setInterface(init.interface);
+	setBareTransport(init.transport);
+
 	dbg.log("initializing scramjet client");
 	// if it already exists, that means the handlers have probably already been setup by the parent document
 	if (!(SCRAMJETCLIENT in <Partial<typeof self>>globalThis)) {

packages/scramjet/src/shared/index.ts

@@ -1,5 +1,8 @@
 import { BareTransport } from "@mercuryworkshop/bare-mux-custom";
 import { ScramjetConfig, ScramjetFlags } from "@/types";
+import DomHandler, { Element } from "domhandler";
+import { URLMeta } from "@rewriters/url";
+import { CookieJar } from "./cookie";
 
 export * from "./cookie";
 export * from "./headers";
@@ -64,22 +67,29 @@ export type Serverbound = {
 };
 
 export type ScramjetInterface = {
-	sendServerbound<K extends keyof Serverbound>(
+	sendServerbound?<K extends keyof Serverbound>(
 		type: K,
 		msg: Serverbound[K][0]
 	): Promise<Serverbound[K][1]>;
-	onClientbound<K extends keyof Clientbound>(
+	onClientbound?<K extends keyof Clientbound>(
 		type: K,
 		listener: (msg: Clientbound[K][0]) => Promise<Clientbound[K][1]>
 	): () => void;
-	sendClientbound<K extends keyof Clientbound>(
+	sendClientbound?<K extends keyof Clientbound>(
 		type: K,
 		msg: Clientbound[K][0]
 	): Promise<Clientbound[K][1]>;
-	onServerbound<K extends keyof Serverbound>(
+	onServerbound?<K extends keyof Serverbound>(
 		type: K,
 		listener: (msg: Serverbound[K][0]) => Promise<Serverbound[K][1]>
 	): () => void;
+	getInjectScripts(
+		meta: URLMeta,
+		handler: DomHandler,
+		config: ScramjetConfig,
+		cookieJar: CookieJar,
+		script: (src: string) => Element
+	): Element[];
 };
 
 export let iface: ScramjetInterface = null!;

packages/scramjet/src/shared/rewriters/html.ts

@@ -5,36 +5,13 @@ import { URLMeta, rewriteUrl } from "@rewriters/url";
 import { rewriteCss } from "@rewriters/css";
 import { rewriteJs } from "@rewriters/js";
 import { CookieJar } from "@/shared/cookie";
-import { config } from "@/shared";
+import { config, iface } from "@/shared";
 import { htmlRules } from "@/shared/htmlRules";
 
-export function getInjectScripts<T>(
-	cookieStore: CookieJar,
-	script: (src: string) => T
-): T[] {
-	const dump = JSON.stringify(cookieStore.dump());
-	const injected = `
-		self.COOKIE = ${dump};
-		$scramjetLoadClient().loadAndHook(${JSON.stringify(config)});
-		if ("document" in self && document?.currentScript) {
-			document.currentScript.remove();
-		}
-	`;
-
-	// for compatibility purpose
-	const base64Injected = bytesToBase64(encoder.encode(injected));
-
-	return [
-		script(config.files.wasm),
-		script(config.files.all),
-		script("data:application/javascript;base64," + base64Injected),
-	];
-}
-
 const encoder = new TextEncoder();
 function rewriteHtmlInner(
 	html: string,
-	cookieStore: CookieJar,
+	cookieJar: CookieJar,
 	meta: URLMeta,
 	fromTop: boolean = false,
 	preRewrite?: (handler: DomHandler) => void,
@@ -46,7 +23,7 @@ function rewriteHtmlInner(
 	parser.write(html);
 	parser.end();
 	if (preRewrite) preRewrite(handler);
-	traverseParsedHtml(handler.root, cookieStore, meta);
+	traverseParsedHtml(handler.root, cookieJar, meta);
 
 	function findhead(node) {
 		if (node.type === ElementType.Tag && node.name === "head") {
@@ -69,7 +46,9 @@ function rewriteHtmlInner(
 		}
 
 		const script = (src: string) => new Element("script", { src });
-		head.children.unshift(...getInjectScripts(cookieStore, script));
+		head.children.unshift(
+			...iface.getInjectScripts(meta, handler, config, cookieJar, script)
+		);
 	}
 
 	if (postRewrite) postRewrite(handler);

packages/scramjet/src/shared/rewriters/wasm.ts

@@ -1,15 +1,14 @@
 // i am a cat. i like to be petted. i like to be fed. i like to be
 import { initSync, Rewriter } from "../../../rewriter/wasm/out/wasm.js";
 import type { JsRewriterOutput } from "../../../rewriter/wasm/out/wasm.js";
-import { codecDecode, codecEncode, config, flagEnabled } from "@/shared";
+import { codecDecode, codecEncode, config, flagEnabled, iface } from "@/shared";
 
 export type { JsRewriterOutput, Rewriter };
 
 import { rewriteUrl, URLMeta } from "@rewriters/url";
 import { htmlRules } from "@/shared/htmlRules";
 import { rewriteCss } from "@rewriters/css";
 import { rewriteJs } from "@rewriters/js";
-import { getInjectScripts } from "@rewriters/html";
 import { CookieJar } from "@/shared/cookie";
 
 let wasm_u8: Uint8Array<ArrayBuffer>;
@@ -64,14 +63,6 @@ export function getRewriter(meta: URLMeta): [Rewriter, () => void] {
 					rewriteUrl,
 					rewriteCss,
 					rewriteJs,
-					getHtmlInjectCode(cookieStore: CookieJar, foundHead: boolean) {
-						let inject = getInjectScripts(
-							cookieStore,
-							(src) => `<script src="${src}"></script>`
-						).join("");
-
-						return foundHead ? `<head>${inject}</head>` : inject;
-					},
 				},
 			},
 			flagEnabled,