[scramjet/core] kill config global

velzie · velzie · commit 4f645718e596 · 2025-11-14T11:17:30.000-05:00
diff --git a/packages/scramjet/packages/core/src/client/client.ts b/packages/scramjet/packages/core/src/client/client.ts
@@ -6,12 +6,7 @@ import { createLocationProxy } from "@client/location";
 import { createWrapFn } from "@client/shared/wrap";
 import { NavigateEvent } from "@client/events";
 import { rewriteUrl, unrewriteUrl, type URLMeta } from "@rewriters/url";
-import {
-	config,
-	flagEnabled,
-	ScramjetContext,
-	ScramjetInterface,
-} from "@/shared";
+import { flagEnabled, ScramjetContext, ScramjetInterface } from "@/shared";
 import { CookieJar } from "@/shared/cookie";
 import { iswindow, ScramjetClientInit } from "./entry";
 import { SingletonBox } from "./singletonbox";
@@ -696,4 +691,8 @@ export class ScramjetClient {
 	flagEnabled(flag: keyof ScramjetConfig["flags"]): boolean {
 		return flagEnabled(flag, this.context, this.url);
 	}
+
+	get config(): ScramjetConfig {
+		return this.context.config;
+	}
 }
diff --git a/packages/scramjet/packages/core/src/client/dom/element.ts b/packages/scramjet/packages/core/src/client/dom/element.ts
@@ -432,39 +432,39 @@ export default function (client: ScramjetClient, self: typeof window) {
 	});
 
 	// TODO: this needs to be done for all insert methods
-	client.Proxy(["Element.prototype.appendChild", "Element.prototype.append"], {
-		apply(ctx) {
-			if (ctx.this instanceof self.HTMLStyleElement) {
-				for (const node of ctx.args) {
-					if (node instanceof self.Text) {
-						node.data = rewriteCss(
-							ctx.args[0].data,
-							client.context,
-							client.meta
-						);
-					}
-				}
-			} else if (ctx.this instanceof self.HTMLScriptElement) {
-				for (const node of ctx.args) {
-					if (node instanceof self.Text) {
-						const newval: string = rewriteJs(
-							node.data,
-							"(anonymous script element)",
-							client.context,
-							client.meta
-						) as string;
-						client.natives.call(
-							"Element.prototype.setAttribute",
-							ctx.this,
-							"scramjet-attr-script-source-src",
-							bytesToBase64(encoder.encode(newval))
-						);
-						node.data = newval;
-					}
-				}
-			}
-		},
-	});
+	// client.Proxy(["Element.prototype.appendChild", "Element.prototype.append"], {
+	// 	apply(ctx) {
+	// 		if (ctx.this instanceof self.HTMLStyleElement) {
+	// 			for (const node of ctx.args) {
+	// 				if (node instanceof self.Text) {
+	// 					node.data = rewriteCss(
+	// 						ctx.args[0].data,
+	// 						client.context,
+	// 						client.meta
+	// 					);
+	// 				}
+	// 			}
+	// 		} else if (ctx.this instanceof self.HTMLScriptElement) {
+	// 			for (const node of ctx.args) {
+	// 				if (node instanceof self.Text) {
+	// 					const newval: string = rewriteJs(
+	// 						node.data,
+	// 						"(anonymous script element)",
+	// 						client.context,
+	// 						client.meta
+	// 					) as string;
+	// 					client.natives.call(
+	// 						"Element.prototype.setAttribute",
+	// 						ctx.this,
+	// 						"scramjet-attr-script-source-src",
+	// 						bytesToBase64(encoder.encode(newval))
+	// 					);
+	// 					node.data = newval;
+	// 				}
+	// 			}
+	// 		}
+	// 	},
+	// });
 
 	client.Proxy("Audio", {
 		construct(ctx) {
@@ -527,11 +527,7 @@ export default function (client: ScramjetClient, self: typeof window) {
 				try {
 					if (!(SCRAMJETCLIENT in realwin)) {
 						// hook the iframe before the client can start to steal globals out of it
-						const newclient = new ScramjetClient(
-							realwin,
-							client.context,
-							client.rpc
-						);
+						const newclient = new ScramjetClient(realwin, client.init);
 						newclient.hook();
 					}
 				} catch {
@@ -560,11 +556,7 @@ export default function (client: ScramjetClient, self: typeof window) {
 				if (!realwin) return realwin;
 
 				if (!(SCRAMJETCLIENT in realwin)) {
-					const newclient = new ScramjetClient(
-						realwin,
-						client.context,
-						client.rpc
-					);
+					const newclient = new ScramjetClient(realwin, client.init);
 					newclient.hook();
 				}
 
diff --git a/packages/scramjet/packages/core/src/client/dom/performance.ts b/packages/scramjet/packages/core/src/client/dom/performance.ts
@@ -1,5 +1,4 @@
 import { ScramjetClient } from "@client/index";
-import { config } from "@/shared";
 
 export default function (client: ScramjetClient, _self: Self) {
 	client.Trap("PerformanceEntry.prototype.name", {
@@ -17,7 +16,7 @@ export default function (client: ScramjetClient, _self: Self) {
 
 	const filterEntries = (entries: PerformanceEntry[]) => {
 		return entries.filter((entry) => {
-			for (const file of config.maskedfiles) {
+			for (const file of client.config.maskedfiles) {
 				if (entry.name.endsWith(file)) {
 					return false;
 				}
diff --git a/packages/scramjet/packages/core/src/client/shared/error.ts b/packages/scramjet/packages/core/src/client/shared/error.ts
@@ -1,4 +1,3 @@
-import { config, flagEnabled } from "@/shared";
 import { unrewriteUrl } from "@rewriters/url";
 import { ScramjetClient } from "@client/index";
 
@@ -14,7 +13,7 @@ export default function (client: ScramjetClient, _self: Self) {
 			const url = stack[i].getFileName();
 
 			try {
-				if (config.maskedfiles.some((f) => url.endsWith(f))) {
+				if (client.config.maskedfiles.some((f) => url.endsWith(f))) {
 					// strip stack frames including scramjet handlers from the trace
 					const lines = newstack.split("\n");
 					const line = lines.find((l) => l.includes(url));
diff --git a/packages/scramjet/packages/core/src/client/shared/eval.ts b/packages/scramjet/packages/core/src/client/shared/eval.ts
@@ -1,11 +1,10 @@
-import { config } from "@/shared";
 import { rewriteJs } from "@rewriters/js";
 import { ScramjetClient } from "@client/index";
 
 export default function (client: ScramjetClient, self: Self) {
 	// used for proxying *direct eval*
 	// eval("...") -> eval($scramjet$rewrite("..."))
-	Object.defineProperty(self, config.globals.rewritefn, {
+	Object.defineProperty(self, client.config.globals.rewritefn, {
 		value: function (js: any) {
 			if (typeof js !== "string") return js;
 
diff --git a/packages/scramjet/packages/core/src/client/shared/import.ts b/packages/scramjet/packages/core/src/client/shared/import.ts
@@ -1,5 +1,4 @@
 import { ScramjetClient } from "@client/index";
-import { config } from "@/shared";
 
 export default function (client: ScramjetClient, self: Self) {
 	const boundimport = client.natives.call(
@@ -30,7 +29,7 @@ export default function (client: ScramjetClient, self: Self) {
 		configurable: false,
 		enumerable: false,
 	});
-	Object.defineProperty(self, config.globals.metafn, {
+	Object.defineProperty(self, client.config.globals.metafn, {
 		value: function (metaobj: any, base: string) {
 			metaobj.url = base;
 			metaobj.resolve = function (url: string) {
diff --git a/packages/scramjet/packages/core/src/client/shared/postmessage.ts b/packages/scramjet/packages/core/src/client/shared/postmessage.ts
@@ -1,7 +1,6 @@
 import { iswindow } from "@client/entry";
 import { SCRAMJETCLIENT } from "@/symbols";
 import { ScramjetClient } from "@client/index";
-import { config } from "@/shared";
 
 export default function (client: ScramjetClient, self: Self) {
 	if (iswindow)
@@ -82,7 +81,7 @@ export default function (client: ScramjetClient, self: Self) {
 			};
 		},
 	});
-	Object.defineProperty(self, config.globals.wrappostmessagefn, {
+	Object.defineProperty(self, client.config.globals.wrappostmessagefn, {
 		value: function (obj: any) {
 			return obj.postMessage.bind(obj);
 		},
diff --git a/packages/scramjet/packages/core/src/client/shared/requests/websocket.ts b/packages/scramjet/packages/core/src/client/shared/requests/websocket.ts
@@ -1,4 +1,3 @@
-import { config } from "@/shared";
 import { type BareWebSocket } from "@mercuryworkshop/bare-mux-custom";
 import { ScramjetClient } from "@client/index";
 
@@ -31,7 +30,9 @@ export default function (client: ScramjetClient, self: typeof globalThis) {
 		new WeakMap();
 	client.Proxy("WebSocket", {
 		construct(ctx) {
-			if (config.allowedwebsockets.some((w) => ctx.args[0].startsWith(w))) {
+			if (
+				client.config.allowedwebsockets.some((w) => ctx.args[0].startsWith(w))
+			) {
 				return ctx.return(client.natives.construct("WebSocket", ...ctx.args));
 			}
 			const fakeWebSocket = new EventTarget() as WebSocket;
diff --git a/packages/scramjet/packages/core/src/client/shared/requests/xmlhttprequest.ts b/packages/scramjet/packages/core/src/client/shared/requests/xmlhttprequest.ts
@@ -1,4 +1,4 @@
-import { config, flagEnabled, ScramjetContext } from "@/shared";
+import { flagEnabled, ScramjetContext } from "@/shared";
 import { rewriteUrl, unrewriteUrl, URLMeta } from "@rewriters/url";
 import { ScramjetClient } from "@client/index";
 
diff --git a/packages/scramjet/packages/core/src/client/shared/sourcemaps.ts b/packages/scramjet/packages/core/src/client/shared/sourcemaps.ts
@@ -1,4 +1,3 @@
-import { config, flagEnabled } from "@/shared";
 import { SCRAMJETCLIENT, SCRAMJETCLIENTNAME } from "@/symbols";
 import { ProxyCtx, ScramjetClient } from "@client/index";
 
@@ -162,7 +161,7 @@ export const enabled = (client: ScramjetClient) =>
 
 export default function (client: ScramjetClient, self: Self) {
 	// every script will push a sourcemap
-	Object.defineProperty(self, config.globals.pushsourcemapfn, {
+	Object.defineProperty(self, client.config.globals.pushsourcemapfn, {
 		value: (buf: Array<number>, tag: string) => {
 			const before = performance.now();
 			registerRewrites(client, buf, tag);
diff --git a/packages/scramjet/packages/core/src/client/shared/wrap.ts b/packages/scramjet/packages/core/src/client/shared/wrap.ts
@@ -1,7 +1,6 @@
 import { iswindow } from "@client/entry";
 import { SCRAMJETCLIENT } from "@/symbols";
 import { ScramjetClient } from "@client/index";
-import { config } from "@/shared";
 // import { argdbg } from "@client/shared/err";
 import { indirectEval } from "@client/shared/eval";
 
@@ -55,29 +54,29 @@ export function createWrapFn(client: ScramjetClient, self: typeof globalThis) {
 
 export const order = 4;
 export default function (client: ScramjetClient, self: typeof globalThis) {
-	Object.defineProperty(self, config.globals.wrapfn, {
+	Object.defineProperty(self, client.config.globals.wrapfn, {
 		value: client.wrapfn,
 		writable: false,
 		configurable: false,
 		enumerable: false,
 	});
-	Object.defineProperty(self, config.globals.wrappropertyfn, {
+	Object.defineProperty(self, client.config.globals.wrappropertyfn, {
 		value: function (str) {
 			if (
 				str === "location" ||
 				str === "parent" ||
 				str === "top" ||
 				str === "eval"
 			)
-				return config.globals.wrappropertybase + str;
+				return client.config.globals.wrappropertybase + str;
 
 			return str;
 		},
 		writable: false,
 		configurable: false,
 		enumerable: false,
 	});
-	Object.defineProperty(self, config.globals.cleanrestfn, {
+	Object.defineProperty(self, client.config.globals.cleanrestfn, {
 		value: function (obj) {
 			// TODO
 		},
@@ -88,7 +87,7 @@ export default function (client: ScramjetClient, self: typeof globalThis) {
 
 	Object.defineProperty(
 		self.Object.prototype,
-		config.globals.wrappropertybase + "location",
+		client.config.globals.wrappropertybase + "location",
 		{
 			get: function () {
 				// if (this.location.constructor.toString().includes("Location")) {
@@ -113,7 +112,7 @@ export default function (client: ScramjetClient, self: typeof globalThis) {
 	);
 	Object.defineProperty(
 		self.Object.prototype,
-		config.globals.wrappropertybase + "parent",
+		client.config.globals.wrappropertybase + "parent",
 		{
 			get: function () {
 				return client.wrapfn(this.parent, false);
@@ -128,7 +127,7 @@ export default function (client: ScramjetClient, self: typeof globalThis) {
 	);
 	Object.defineProperty(
 		self.Object.prototype,
-		config.globals.wrappropertybase + "top",
+		client.config.globals.wrappropertybase + "top",
 		{
 			get: function () {
 				return client.wrapfn(this.top, false);
@@ -142,7 +141,7 @@ export default function (client: ScramjetClient, self: typeof globalThis) {
 	);
 	Object.defineProperty(
 		self.Object.prototype,
-		config.globals.wrappropertybase + "eval",
+		client.config.globals.wrappropertybase + "eval",
 		{
 			get: function () {
 				return client.wrapfn(this.eval, true);
@@ -172,7 +171,7 @@ export default function (client: ScramjetClient, self: typeof globalThis) {
 	// ((t)=>$scramjet$tryset(location,"+=",t)||location+=t)(...);
 	// it has to be a discrete function because there's always the possibility that "location" is a local variable
 	// we have to use an IIFE to avoid duplicating side-effects in the getter
-	Object.defineProperty(self, config.globals.trysetfn, {
+	Object.defineProperty(self, client.config.globals.trysetfn, {
 		value: function (lhs: any, op: string, rhs: any) {
 			// TODO: not cross frame safe
 			if (lhs instanceof self.Location) {
diff --git a/packages/scramjet/packages/core/src/fetch/index.ts b/packages/scramjet/packages/core/src/fetch/index.ts
@@ -14,7 +14,7 @@ import {
 } from "@rewriters/url";
 import { rewriteJs } from "@rewriters/js";
 import { ScramjetHeaders } from "@/shared/headers";
-import { config, flagEnabled, ScramjetContext } from "@/shared";
+import { flagEnabled, ScramjetContext } from "@/shared";
 import { rewriteHtml } from "@rewriters/html";
 import { rewriteCss } from "@rewriters/css";
 import { rewriteWorkers } from "@rewriters/worker";
diff --git a/packages/scramjet/packages/core/src/shared/index.ts b/packages/scramjet/packages/core/src/shared/index.ts
@@ -25,12 +25,6 @@ export function flagEnabled(
 
 	return value;
 }
-
-export let config: ScramjetConfig;
-export function setConfig(newConfig: ScramjetConfig) {
-	config = newConfig;
-}
-
 export type ScramjetInterface = {
 	codecEncode: (input: string) => string;
 	codecDecode: (input: string) => string;
diff --git a/packages/scramjet/packages/core/src/shared/rewriters/html.ts b/packages/scramjet/packages/core/src/shared/rewriters/html.ts
@@ -5,7 +5,7 @@ import { URLMeta, rewriteUrl } from "@rewriters/url";
 import { rewriteCss } from "@rewriters/css";
 import { rewriteJs } from "@rewriters/js";
 import { CookieJar } from "@/shared/cookie";
-import { config, ScramjetContext } from "@/shared";
+import { ScramjetContext } from "@/shared";
 import { htmlRules } from "@/shared/htmlRules";
 
 const encoder = new TextEncoder();
diff --git a/packages/scramjet/packages/core/src/shared/rewriters/js.ts b/packages/scramjet/packages/core/src/shared/rewriters/js.ts
@@ -1,4 +1,4 @@
-import { config, flagEnabled, ScramjetContext } from "@/shared";
+import { flagEnabled, ScramjetContext } from "@/shared";
 import { URLMeta } from "@rewriters/url";
 
 import { getRewriter, JsRewriterOutput, textDecoder } from "@rewriters/wasm";
diff --git a/packages/scramjet/packages/core/src/shared/rewriters/url.ts b/packages/scramjet/packages/core/src/shared/rewriters/url.ts
@@ -1,4 +1,4 @@
-import { config, ScramjetContext } from "@/shared";
+import { ScramjetContext } from "@/shared";
 import { rewriteJs } from "@rewriters/js";
 
 export type URLMeta = {
diff --git a/packages/scramjet/packages/core/src/shared/rewriters/wasm.ts b/packages/scramjet/packages/core/src/shared/rewriters/wasm.ts
@@ -1,7 +1,7 @@
 // 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 { config, flagEnabled, ScramjetContext } from "@/shared";
+import { flagEnabled, ScramjetContext } from "@/shared";
 
 export type { JsRewriterOutput, Rewriter };
 
diff --git a/packages/scramjet/packages/core/src/shared/rewriters/worker.ts b/packages/scramjet/packages/core/src/shared/rewriters/worker.ts
@@ -1,4 +1,4 @@
-import { config, ScramjetContext } from "@/shared";
+import { ScramjetContext } from "@/shared";
 import { rewriteJs } from "@rewriters/js";
 import { URLMeta } from "@rewriters/url";
 

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-import { config, flagEnabled, ScramjetContext } from "@/shared";`
	`1`	`+import { flagEnabled, ScramjetContext } from "@/shared";`
`2`	`2`	`import { rewriteUrl, unrewriteUrl, URLMeta } from "@rewriters/url";`
`3`	`3`	`import { ScramjetClient } from "@client/index";`
`4`	`4`