update all imports to not use $scramjet

velzie · velzie · commit 117a5d40e4e2 · 2025-07-15T13:33:04.000-04:00
diff --git a/src/client/client.ts b/src/client/client.ts
@@ -8,16 +8,18 @@ import { createLocationProxy } from "./location";
 import { nativeGetOwnPropertyDescriptor } from "./natives";
 import {
 	BareClient,
-	CookieStore,
-	config,
-	unrewriteUrl,
-	rewriteUrl,
-} from "../shared";
-import type { BareClient as BareClientType } from "@mercuryworkshop/bare-mux";
+	type BareClient as BareClientType,
+} from "@mercuryworkshop/bare-mux";
 import { createWrapFn } from "./shared/wrap";
 import { NavigateEvent } from "./events";
-import type { URLMeta } from "../shared/rewriters/url";
+import {
+	rewriteUrl,
+	unrewriteUrl,
+	type URLMeta,
+} from "../shared/rewriters/url";
 import { SourceMaps } from "./shared/sourcemaps";
+import { config } from "../shared";
+import { CookieStore } from "../shared/cookie";
 
 type NativeStore = {
 	store: Record<string, any>;
diff --git a/src/client/document.ts b/src/client/document.ts
@@ -1,4 +1,4 @@
-import { rewriteUrl } from "../shared";
+import { rewriteUrl } from "../shared/rewriters/url";
 import { ScramjetClient } from "./client";
 import { getOwnPropertyDescriptorHandler } from "./helpers";
 
diff --git a/src/client/dom/beacon.ts b/src/client/dom/beacon.ts
@@ -1,4 +1,4 @@
-import { rewriteUrl } from "../../shared";
+import { rewriteUrl } from "../../shared/rewriters/url";
 import { ScramjetClient } from "../client";
 
 export default function (client: ScramjetClient, _self: Self) {
diff --git a/src/client/dom/css.ts b/src/client/dom/css.ts
@@ -1,5 +1,5 @@
+import { rewriteCss, unrewriteCss } from "../../shared/rewriters/css";
 import { ScramjetClient } from "../client";
-import { rewriteCss, unrewriteCss } from "../../shared";
 
 export default function (client: ScramjetClient) {
 	client.Proxy("CSSStyleDeclaration.prototype.setProperty", {
diff --git a/src/client/dom/document.ts b/src/client/dom/document.ts
@@ -1,4 +1,4 @@
-import { rewriteHtml } from "../../shared";
+import { rewriteHtml } from "../../shared/rewriters/html";
 import { ScramjetClient } from "../client";
 
 export default function (client: ScramjetClient, _self: Self) {
diff --git a/src/client/dom/element.ts b/src/client/dom/element.ts
@@ -1,13 +1,11 @@
+import { htmlRules } from "../../shared/htmlRules";
+import { rewriteCss, unrewriteCss } from "../../shared/rewriters/css";
+import { rewriteHtml, unrewriteHtml } from "../../shared/rewriters/html";
+import { rewriteJs } from "../../shared/rewriters/js";
+import { rewriteUrl, unrewriteUrl } from "../../shared/rewriters/url";
 import { SCRAMJETCLIENT } from "../../symbols";
 import { ScramjetClient } from "../client";
 import { nativeGetOwnPropertyDescriptor } from "../natives";
-import {
-	unrewriteUrl,
-	rewriteUrl,
-	htmlRules,
-	unrewriteHtml,
-} from "../../shared";
-import { unrewriteCss, rewriteCss, rewriteHtml, rewriteJs } from "../../shared";
 
 const encoder = new TextEncoder();
 function bytesToBase64(bytes: Uint8Array) {
diff --git a/src/client/dom/fontface.ts b/src/client/dom/fontface.ts
@@ -1,5 +1,5 @@
+import { rewriteCss } from "../../shared/rewriters/css";
 import { ScramjetClient } from "../client";
-import { rewriteCss } from "../../shared";
 
 export default function (client: ScramjetClient, _self: Self) {
 	client.Proxy("FontFace", {
diff --git a/src/client/dom/history.ts b/src/client/dom/history.ts
@@ -1,5 +1,5 @@
+import { rewriteUrl } from "../../shared/rewriters/url";
 import { ScramjetClient } from "../client";
-import { rewriteUrl } from "../../shared";
 import { UrlChangeEvent } from "../events";
 
 export default function (client: ScramjetClient, _self: Self) {
diff --git a/src/client/dom/open.ts b/src/client/dom/open.ts
@@ -1,6 +1,6 @@
-import { rewriteUrl } from "../../shared";
 import { ScramjetClient } from "../client";
 import { SCRAMJETCLIENT } from "../../symbols";
+import { rewriteUrl } from "../../shared/rewriters/url";
 
 export default function (client: ScramjetClient) {
 	client.Proxy("window.open", {
diff --git a/src/client/dom/performance.ts b/src/client/dom/performance.ts
@@ -1,4 +1,4 @@
-import { unrewriteUrl } from "../../shared";
+import { unrewriteUrl } from "../../shared/rewriters/url";
 import { ScramjetClient } from "../client";
 
 export default function (client: ScramjetClient, _self: Self) {
diff --git a/src/client/dom/protocol.ts b/src/client/dom/protocol.ts
@@ -1,4 +1,4 @@
-import { rewriteUrl } from "../../shared";
+import { rewriteUrl } from "../../shared/rewriters/url";
 import { ScramjetClient } from "../client";
 
 export default function (client: ScramjetClient, self: Self) {
diff --git a/src/client/dom/serviceworker.ts b/src/client/dom/serviceworker.ts
@@ -1,7 +1,7 @@
-import { rewriteUrl } from "../../shared";
 import { ScramjetClient } from "../client";
 import { type MessageC2W } from "../../worker";
-import { flagEnabled } from "../../scramjet";
+import { flagEnabled } from "../../shared";
+import { rewriteUrl } from "../../shared/rewriters/url";
 
 // we need a late order because we're mangling with addEventListener at a higher level
 export const order = 2;
diff --git a/src/client/index.ts b/src/client/index.ts
@@ -1,6 +1,6 @@
 // entrypoint for scramjet.client.js
 
-import { loadCodecs } from "../scramjet";
+import { loadCodecs } from "../shared/index";
 import { SCRAMJETCLIENT } from "../symbols";
 import { ScramjetClient } from "./client";
 import { ScramjetContextEvent, UrlChangeEvent } from "./events";
diff --git a/src/client/location.ts b/src/client/location.ts
@@ -1,17 +1,16 @@
-// @ts-nocheck
 import { ScramjetClient } from "./client";
 import { nativeGetOwnPropertyDescriptor } from "./natives";
-import { rewriteUrl } from "../shared";
 import { UrlChangeEvent } from "./events";
 import { iswindow } from ".";
+import { rewriteUrl } from "../shared/rewriters/url";
 
 export function createLocationProxy(
 	client: ScramjetClient,
 	self: typeof globalThis
 ) {
 	const Location = iswindow ? self.Location : self.WorkerLocation;
 	// location cannot be Proxy()d
-	const fakeLocation = {};
+	const fakeLocation: any = {};
 	Object.setPrototypeOf(fakeLocation, Location.prototype);
 	fakeLocation.constructor = Location;
 
@@ -32,7 +31,7 @@ export function createLocationProxy(
 		const native = nativeGetOwnPropertyDescriptor(descriptorSource, prop);
 		if (!native) continue;
 
-		const desc = {
+		const desc: Partial<PropertyDescriptor> = {
 			configurable: true,
 			enumerable: true,
 		};
diff --git a/src/client/shared/blob.ts b/src/client/shared/blob.ts
@@ -1,4 +1,4 @@
-import { rewriteBlob, unrewriteBlob } from "../../shared";
+import { rewriteBlob, unrewriteBlob } from "../../shared/rewriters/url";
 import { ScramjetClient } from "../client";
 export default function (client: ScramjetClient) {
 	// hide the origin from object urls from the page
diff --git a/src/client/shared/caches.ts b/src/client/shared/caches.ts
@@ -1,4 +1,4 @@
-import { rewriteUrl } from "../../shared";
+import { rewriteUrl } from "../../shared/rewriters/url";
 import { ScramjetClient } from "../client";
 
 export default function (client: ScramjetClient, _self: Self) {
diff --git a/src/client/shared/err.ts b/src/client/shared/err.ts
@@ -1,4 +1,4 @@
-import { flagEnabled } from "../../scramjet";
+import { flagEnabled } from "../../shared";
 import { ScramjetClient } from "../client";
 
 export const enabled = (client: ScramjetClient) =>
diff --git a/src/client/shared/error.ts b/src/client/shared/error.ts
@@ -1,5 +1,5 @@
-import { flagEnabled } from "../../scramjet";
-import { config, unrewriteUrl } from "../../shared";
+import { config, flagEnabled } from "../../shared";
+import { unrewriteUrl } from "../../shared/rewriters/url";
 import { ScramjetClient } from "../client";
 
 export const enabled = (client: ScramjetClient) =>
@@ -13,7 +13,7 @@ export default function (client: ScramjetClient, _self: Self) {
 		for (let i = 0; i < stack.length; i++) {
 			const url = stack[i].getFileName();
 
-			if (url.endsWith(config.files.client)) {
+			if (url.endsWith(config.files.all)) {
 				// 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/src/client/shared/eval.ts b/src/client/shared/eval.ts
@@ -1,5 +1,6 @@
+import { config } from "../../shared";
+import { rewriteJs } from "../../shared/rewriters/js";
 import { ScramjetClient } from "../client";
-import { config, rewriteJs } from "../../shared";
 
 export default function (client: ScramjetClient, self: Self) {
 	// used for proxying *direct eval*
diff --git a/src/client/shared/event.ts b/src/client/shared/event.ts
@@ -1,5 +1,5 @@
 import { iswindow } from "..";
-import { unrewriteUrl } from "../../shared";
+import { unrewriteUrl } from "../../shared/rewriters/url";
 import { SCRAMJETCLIENT } from "../../symbols";
 import { ScramjetClient } from "../client";
 import { getOwnPropertyDescriptorHandler } from "../helpers";
diff --git a/src/client/shared/function.ts b/src/client/shared/function.ts
@@ -1,5 +1,5 @@
+import { rewriteJs } from "../../shared/rewriters/js";
 import { ScramjetClient, ProxyCtx, Proxy } from "../client";
-import { rewriteJs } from "../../shared";
 
 function rewriteFunction(ctx: ProxyCtx, client: ScramjetClient) {
 	const stringifiedFunction = ctx.call().toString();
diff --git a/src/client/shared/requests/eventsource.ts b/src/client/shared/requests/eventsource.ts
@@ -1,4 +1,4 @@
-import { unrewriteUrl, rewriteUrl } from "../../../shared";
+import { rewriteUrl, unrewriteUrl } from "../../../shared/rewriters/url";
 import { ScramjetClient } from "../../client";
 
 export default function (client: ScramjetClient) {
diff --git a/src/client/shared/requests/fetch.ts b/src/client/shared/requests/fetch.ts
@@ -1,9 +1,8 @@
 // ts throws an error if you dont do window.fetch
 
 import { isemulatedsw } from "../..";
-import { unrewriteUrl } from "../../../shared";
+import { rewriteUrl, unrewriteUrl } from "../../../shared/rewriters/url";
 import { ScramjetClient } from "../../client";
-import { rewriteUrl } from "../../../shared";
 
 export default function (client: ScramjetClient) {
 	client.Proxy("fetch", {
diff --git a/src/client/shared/requests/xmlhttprequest.ts b/src/client/shared/requests/xmlhttprequest.ts
@@ -1,5 +1,5 @@
-import { flagEnabled } from "../../../scramjet";
-import { config, unrewriteUrl, rewriteUrl } from "../../../shared";
+import { config, flagEnabled } from "../../../shared";
+import { rewriteUrl, unrewriteUrl } from "../../../shared/rewriters/url";
 import { ScramjetClient } from "../../client";
 
 export default function (client: ScramjetClient, self: Self) {
diff --git a/src/client/shared/sourcemaps.ts b/src/client/shared/sourcemaps.ts
@@ -1,4 +1,4 @@
-import { flagEnabled } from "../../scramjet";
+import { flagEnabled } from "../../shared";
 import { SCRAMJETCLIENT, SCRAMJETCLIENTNAME } from "../../symbols";
 import { ProxyCtx, ScramjetClient } from "../client";
 
@@ -141,6 +141,7 @@ function doUnrewrite(ctx: ProxyCtx) {
 
 	if (!rewrites) {
 		console.warn("failed to get rewrites for tag", tag);
+
 		return ctx.return(stringified);
 	}
 
diff --git a/src/client/shared/worker.ts b/src/client/shared/worker.ts
@@ -1,5 +1,5 @@
-import { BareMuxConnection } from "../../shared";
-import { rewriteUrl } from "../../shared";
+import { BareMuxConnection } from "@mercuryworkshop/bare-mux";
+import { rewriteUrl } from "../../shared/rewriters/url";
 import { ScramjetClient } from "../client";
 
 export default function (client: ScramjetClient, _self: typeof globalThis) {
diff --git a/src/client/swruntime.ts b/src/client/swruntime.ts
@@ -1,5 +1,5 @@
+import { unrewriteUrl } from "../shared/rewriters/url";
 import { ScramjetClient } from "./client";
-import { unrewriteUrl } from "../shared";
 
 export class ScramjetServiceWorkerRuntime {
 	recvport: MessagePort;
diff --git a/src/client/worker/importScripts.ts b/src/client/worker/importScripts.ts
@@ -1,4 +1,4 @@
-import { rewriteUrl } from "../../shared";
+import { rewriteUrl } from "../../shared/rewriters/url";
 import { ScramjetClient } from "../client";
 
 export default function (client: ScramjetClient) {
diff --git a/src/controller/index.ts b/src/controller/index.ts
@@ -1,6 +1,12 @@
+import {
+	codecDecode,
+	codecEncode,
+	config,
+	loadCodecs,
+	setConfig,
+} from "../shared/index";
 import { ScramjetConfig, ScramjetInitConfig } from "../types";
 import { ScramjetFrame } from "./frame";
-import { $scramjet, loadCodecs } from "../scramjet";
 
 export class ScramjetController {
 	private db: IDBDatabase;
@@ -20,10 +26,8 @@ export class ScramjetController {
 				pushsourcemapfn: "$scramjet$pushsourcemap",
 			},
 			files: {
-				wasm: "/scramjet.wasm.js",
-				shared: "/scramjet.shared.js",
-				worker: "/scramjet.worker.js",
-				client: "/scramjet.client.js",
+				wasm: "/scramjet.wasm.wasm",
+				all: "/scramjet.all.js",
 				sync: "/scramjet.sync.js",
 			},
 			flags: {
@@ -65,7 +69,7 @@ export class ScramjetController {
 		const newConfig = deepMerge(defaultConfig, config);
 		newConfig.codec.encode = newConfig.codec.encode.toString();
 		newConfig.codec.decode = newConfig.codec.decode.toString();
-		$scramjet.config = newConfig as ScramjetConfig;
+		setConfig(newConfig as ScramjetConfig);
 	}
 
 	async init(): Promise<void> {
@@ -74,7 +78,7 @@ export class ScramjetController {
 		await this.openIDB();
 		navigator.serviceWorker.controller?.postMessage({
 			scramjet$type: "loadConfig",
-			config: $scramjet.config,
+			config,
 		});
 		dbg.log("config loaded");
 	}
@@ -90,14 +94,14 @@ export class ScramjetController {
 	encodeUrl(url: string | URL): string {
 		if (url instanceof URL) url = url.toString();
 
-		return $scramjet.config.prefix + $scramjet.codec.encode(url);
+		return config.prefix + codecEncode(url);
 	}
 
 	decodeUrl(url: string | URL) {
 		if (url instanceof URL) url = url.toString();
-		const prefixed = location.origin + $scramjet.config.prefix;
+		const prefixed = location.origin + config.prefix;
 
-		return $scramjet.codec.decode(url.slice(prefixed.length));
+		return codecDecode(url.slice(prefixed.length));
 	}
 
 	async openIDB(): Promise<IDBDatabase> {
@@ -139,16 +143,16 @@ export class ScramjetController {
 		}
 		const tx = this.db.transaction("config", "readwrite");
 		const store = tx.objectStore("config");
-		const req = store.put($scramjet.config, "config");
+		const req = store.put(config, "config");
 
 		return new Promise((resolve, reject) => {
 			req.onsuccess = resolve;
 			req.onerror = reject;
 		});
 	}
 
-	async modifyConfig(config: ScramjetConfig) {
-		$scramjet.config = Object.assign({}, $scramjet.config, config);
+	async modifyConfig(newconfig: ScramjetConfig) {
+		setConfig(Object.assign({}, config, newconfig));
 		loadCodecs();
 
 		await this.#saveConfig();
diff --git a/src/log.ts b/src/log.ts
@@ -1,4 +1,4 @@
-import { flagEnabled } from "./scramjet";
+import { flagEnabled } from "./shared";
 import type { URLMeta } from "./shared/rewriters/url";
 
 const logfuncs = {
diff --git a/src/shared.ts b/src/shared.ts
diff --git a/src/shared/htmlRules.ts b/src/shared/htmlRules.ts
diff --git a/src/shared/index.ts b/src/shared/index.ts
diff --git a/src/shared/rewriters/html.ts b/src/shared/rewriters/html.ts
diff --git a/src/shared/rewriters/js.ts b/src/shared/rewriters/js.ts
diff --git a/src/shared/rewriters/url.ts b/src/shared/rewriters/url.ts
diff --git a/src/shared/rewriters/wasm.ts b/src/shared/rewriters/wasm.ts
diff --git a/src/shared/rewriters/worker.ts b/src/shared/rewriters/worker.ts
diff --git a/src/types.ts b/src/types.ts
diff --git a/src/worker/error.ts b/src/worker/error.ts
diff --git a/src/worker/fetch.ts b/src/worker/fetch.ts
diff --git a/src/worker/index.ts b/src/worker/index.ts

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-import { rewriteUrl } from "../shared";`
	`1`	`+import { rewriteUrl } from "../shared/rewriters/url";`
`2`	`2`	`import { ScramjetClient } from "./client";`
`3`	`3`	`import { getOwnPropertyDescriptorHandler } from "./helpers";`
`4`	`4`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-import { rewriteUrl } from "../../shared";`
	`1`	`+import { rewriteUrl } from "../../shared/rewriters/url";`
`2`	`2`	`import { ScramjetClient } from "../client";`
`3`	`3`
`4`	`4`	`export default function (client: ScramjetClient, _self: Self) {`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-import { rewriteHtml } from "../../shared";`
	`1`	`+import { rewriteHtml } from "../../shared/rewriters/html";`
`2`	`2`	`import { ScramjetClient } from "../client";`
`3`	`3`
`4`	`4`	`export default function (client: ScramjetClient, _self: Self) {`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-import { unrewriteUrl } from "../../shared";`
	`1`	`+import { unrewriteUrl } from "../../shared/rewriters/url";`
`2`	`2`	`import { ScramjetClient } from "../client";`
`3`	`3`
`4`	`4`	`export default function (client: ScramjetClient, _self: Self) {`