[scramjet/core] clean up worker inject scripts

Author: Percslol

packages/chrome/src/proxy/scramjet.ts

@@ -244,18 +244,10 @@ export function createFetchHandler(controller: Controller) {
 
 	const getWorkerInjectScripts: ScramjetInterface["getWorkerInjectScripts"] = (
 		meta,
-		js,
-		type
+		type,
+		script
 	) => {
-		const module = type === "module";
 		let str = "";
-		const script = (script: string) => {
-			if (module) {
-				str += `import "${script}"\n`;
-			} else {
-				str += `importScripts("${script}");\n`;
-			}
-		};
 
 		const injectLoad = `
 				$injectLoad({
@@ -267,9 +259,11 @@ export function createFetchHandler(controller: Controller) {
 					prefix: "${controller.prefix.href}",
 				});
 			`;
-		script(controller.prefix.href + virtualWasmPath);
-		script(controller.prefix.href + virtualInjectPath);
-		script(`data:application/javascript;base64,${base64Encode(injectLoad)}`);
+		str += script(controller.prefix.href + virtualWasmPath);
+		str += script(controller.prefix.href + virtualInjectPath);
+		str += script(
+			`data:application/javascript;base64,${base64Encode(injectLoad)}`
+		);
 
 		return str;
 	};

packages/scramjet/packages/controller/src/index.ts

@@ -305,19 +305,11 @@ class Frame {
 					{ ...$scramjet.defaultConfig, ...cfg },
 					new URL(this.prefix, location.href)
 				),
-				getWorkerInjectScripts: (meta, js, type, url) => {
-					const module = type === "module";
+				getWorkerInjectScripts: (meta, type, script) => {
 					let str = "";
-					const script = (script: string) => {
-						if (module) {
-							str += `import "${script}"\n`;
-						} else {
-							str += `importScripts("${script}");\n`;
-						}
-					};
 
-					script(config.scramjetPath);
-					script(this.prefix + config.virtualWasmPath);
+					str += script(config.scramjetPath);
+					str += script(this.prefix + config.virtualWasmPath);
 					str += `
 					(()=>{
 						const { ScramjetClient, CookieJar, setWasm } = $scramjet;

packages/scramjet/packages/core/src/shared/index.ts

@@ -36,9 +36,8 @@ export type ScramjetInterface = {
 	): Element[];
 	getWorkerInjectScripts?(
 		meta: URLMeta,
-		js: string | Uint8Array,
-		type: string,
-		url: string
+		type: "module" | undefined,
+		script: (src: string) => string
 	): string;
 };
 

packages/scramjet/packages/core/src/shared/rewriters/worker.ts

@@ -5,12 +5,18 @@ import { URLMeta } from "@rewriters/url";
 export function rewriteWorkers(
 	context: ScramjetContext,
 	js: string | Uint8Array,
-	type: string,
+	type: "module" | undefined,
 	url: string,
 	meta: URLMeta
 ) {
 	const module = type === "module";
-	let str = context.interface.getWorkerInjectScripts(meta, js, type, url);
+	const script = (script: string) => {
+		if (module) {
+			return `import "${script}"\n`;
+		}
+		return `importScripts("${script}");\n`;
+	};
+	let str = context.interface.getWorkerInjectScripts(meta, type, script);
 	let rewritten = rewriteJs(js, url, context, meta, module);
 	if (rewritten instanceof Uint8Array) {
 		rewritten = new TextDecoder().decode(rewritten);