Merge pull request #11 from MercuryWorkshop/globals

Globals

.eslintrc.json

@@ -7,15 +7,17 @@
 		"no-unused-labels": "error",
 		"no-unused-vars": "error",
 		"quotes": ["error", "double"],
-        "max-lines-per-function": ["error", {
+		"max-lines-per-function": [
+			"error",
+			{
 				"max": 200,
 				"skipComments": true
-        }],
+			}
+		],
 		"getter-return": "error",
 		"newline-before-return": "error",
 		"no-multiple-empty-lines": "error",
 		"no-var": "error",
-        "indent": ["warn", 4],
 		"no-this-before-super": "warn",
 		"no-useless-return": "error",
 		"no-shadow": "error",

README.md

@@ -7,11 +7,11 @@ It currently does not support most websites due to it being very early in the de
 The UI is not finalized and only used as a means to test the web proxy.
 
 ## How to build
+
 Running `pnpm dev` will build Scramjet and start a dev server on localhost:1337. If you only want to build the proxy without using the dev server, run `pnpm build`.
 
-
-
 ## TODO
+
 - Finish HTML rewriting
   - `<script type="importmap"></script>` rewriting
     - Make an array of all possible import values and pass the array onto the JS rewriter, then rewrite all the URLs inside of it

package.json

@@ -9,9 +9,8 @@
 		"url": "https://github.com/MercuryWorkshop/scramjet"
 	},
 	"scripts": {
-    "build": "rollup -c",
+		"build": "rspack build",
 		"dev": "node server.js",
-    "temp": "rollup -c -w",
 		"prepublish": "pnpm build",
 		"pub": "pnpm publish --no-git-checks --access public"
 	},
@@ -27,9 +26,9 @@
 		"@mercuryworkshop/bare-as-module3": "^2.2.2",
 		"@mercuryworkshop/epoxy-transport": "^2.1.3",
 		"@mercuryworkshop/libcurl-transport": "^1.3.6",
-    "@rollup/plugin-inject": "^5.0.5",
-    "@rollup/plugin-replace": "^5.0.5",
-    "@rollup/plugin-node-resolve": "^15.2.3",
+		"@rsdoctor/rspack-plugin": "^0.3.7",
+		"@rspack/cli": "^0.7.5",
+		"@rspack/core": "^0.7.5",
 		"@tomphttp/bare-server-node": "^2.0.3",
 		"@types/eslint": "^8.56.10",
 		"@types/estree": "^1.0.5",
@@ -40,8 +39,7 @@
 		"dotenv": "^16.4.5",
 		"eslint": "^8.57.0",
 		"fastify": "^4.26.2",
-    "rollup": "^4.17.2",
-    "rollup-plugin-typescript2": "^0.36.0",
+		"prettier": "^3.3.3",
 		"tslib": "^2.6.2",
 		"typescript": "^5.4.5"
 	},
@@ -55,6 +53,7 @@
 		"domhandler": "^5.0.3",
 		"domutils": "^3.1.0",
 		"htmlparser2": "^9.1.0",
-    "meriyah": "^4.4.2"
+		"meriyah": "^4.4.2",
+		"parse-domain": "^8.0.2"
 	}
 }

prettier.json

@@ -0,0 +1,6 @@
+{
+	"trailingComma": "es5",
+	"useTabs": true,
+	"semi": true,
+	"singleQuote": false
+}

rollup.config.js

@@ -1,34 +0,0 @@
-import typescript from "rollup-plugin-typescript2";
-import { nodeResolve } from '@rollup/plugin-node-resolve';
-import { join } from "node:path";
-import fs from "node:fs" 
-import { fileURLToPath } from "node:url";
-
-// check if its
-const production = !process.env.ROLLUP_WATCH;
-console.log(production)
-fs.rmSync(join(fileURLToPath(new URL(".", import.meta.url)), "./dist"), { recursive: true, force: true })
-
-const commonPlugins = () => [
-    typescript(),
-    nodeResolve(),
-]
-
-export default {
-    plugins: commonPlugins(),
-    treeshake: "recommended",
-    input: {
-        client: "./src/client/index.ts",
-        shared: "./src/shared/index.ts",
-        worker: "./src/worker/index.ts",
-        codecs: "./src/codecs/index.ts",
-        config: "./src/scramjet.config.ts"
-    },
-    output: {
-        entryFileNames: "scramjet.[name].js",
-        dir: "./dist",
-        format: "esm",
-        sourcemap: true,
-        compact: production,
-    },
-};

rspack.config.js

@@ -0,0 +1,53 @@
+import { defineConfig } from "@rspack/cli";
+// import { RsdoctorRspackPlugin } from "@rsdoctor/rspack-plugin";
+import { join } from "path";
+import { fileURLToPath } from "url";
+
+const __dirname = fileURLToPath(new URL(".", import.meta.url));
+
+export default defineConfig({
+	// change to production when needed
+	mode: "development",
+	entry: {
+		shared: join(__dirname, "src/shared/index.ts"),
+		worker: join(__dirname, "src/worker/index.ts"),
+		client: join(__dirname, "src/client/index.ts"),
+		config: join(__dirname, "src/scramjet.config.ts"),
+		codecs: join(__dirname, "src/codecs/index.ts"),
+	},
+	resolve: {
+		extensions: [".ts", ".js"],
+	},
+	module: {
+		rules: [
+			{
+				test: /\.ts$/,
+				use: "builtin:swc-loader",
+				exclude: ["/node_modules/"],
+				options: {
+					jsc: {
+						parser: {
+							syntax: "typescript",
+						},
+					},
+				},
+				type: "javascript/auto",
+			},
+		],
+	},
+	output: {
+		filename: "scramjet.[name].js",
+		path: join(__dirname, "dist"),
+		iife: true,
+		clean: true,
+	},
+	plugins: [
+		// new RsdoctorRspackPlugin({
+		//     supports: {
+		//         parseBundle: true,
+		//         banner: true
+		//     }
+		// })
+	],
+	watch: true,
+});

server.js

@@ -4,19 +4,17 @@ import { createServer } from "http";
 import Fastify from "fastify";
 import fastifyStatic from "@fastify/static";
 import { join } from "node:path";
-import fs from "node:fs"
-import { spawn } from "node:child_process"
+import { spawn } from "node:child_process";
 import { fileURLToPath } from "node:url";
-import { loadConfigFile } from "rollup/loadConfigFile"
 
 //transports
-import { baremuxPath } from "@mercuryworkshop/bare-mux/node"
-import { epoxyPath } from "@mercuryworkshop/epoxy-transport"
-import { libcurlPath } from "@mercuryworkshop/libcurl-transport"
-import { bareModulePath } from "@mercuryworkshop/bare-as-module3"
+import { baremuxPath } from "@mercuryworkshop/bare-mux/node";
+import { epoxyPath } from "@mercuryworkshop/epoxy-transport";
+import { libcurlPath } from "@mercuryworkshop/libcurl-transport";
+import { bareModulePath } from "@mercuryworkshop/bare-as-module3";
 
 const bare = createBareServer("/bare/", {
-    logErrors: true
+	logErrors: true,
 });
 
 const fastify = Fastify({
@@ -28,50 +26,54 @@ const fastify = Fastify({
 				} else {
 					handler(req, res);
 				}
-            }).on("upgrade", (req, socket, head) => {
+			})
+			.on("upgrade", (req, socket, head) => {
 				if (bare.shouldRoute(req)) {
 					bare.routeUpgrade(req, socket, head);
 				} else {
 					socket.end();
 				}
-            })
-    }
+			});
+	},
 });
 
 fastify.register(fastifyStatic, {
 	root: join(fileURLToPath(new URL(".", import.meta.url)), "./static"),
-    decorateReply: false
+	decorateReply: false,
 });
 fastify.register(fastifyStatic, {
 	root: join(fileURLToPath(new URL(".", import.meta.url)), "./dist"),
 	prefix: "/scram/",
-    decorateReply: false
-})
+	decorateReply: false,
+});
 fastify.register(fastifyStatic, {
 	root: baremuxPath,
 	prefix: "/baremux/",
-    decorateReply: false
-})
+	decorateReply: false,
+});
 fastify.register(fastifyStatic, {
 	root: epoxyPath,
 	prefix: "/epoxy/",
-    decorateReply: false
-})
+	decorateReply: false,
+});
 fastify.register(fastifyStatic, {
 	root: libcurlPath,
 	prefix: "/libcurl/",
-    decorateReply: false
-})
+	decorateReply: false,
+});
 fastify.register(fastifyStatic, {
 	root: bareModulePath,
 	prefix: "/baremod/",
-    decorateReply: false
-})
+	decorateReply: false,
+});
 fastify.listen({
-    port: process.env.PORT || 1337
+	port: process.env.PORT || 1337,
 });
 
-const watch = spawn("rollup", ["-c", "-w"], { detached: true });
+const watch = spawn("pnpm", ["rspack", "-w"], {
+	detached: true,
+	cwd: process.cwd(),
+});
 
 watch.stdout.on("data", (data) => {
 	console.log(`${data}`);

src/client/beacon.ts

@@ -1,4 +1,4 @@
-import { encodeUrl } from "../shared";
+import { encodeUrl } from "./shared";
 
 navigator.sendBeacon = new Proxy(navigator.sendBeacon, {
 	apply(target, thisArg, argArray) {

src/client/css.ts

@@ -1,26 +1,26 @@
-import { rewriteCss } from "../shared";
+import { rewriteCss } from "./shared";
 
-const cssProperties = ["background", "background-image", "mask", "mask-image", "list-style", "list-style-image", "border-image", "border-image-source", "cursor"];
-const jsProperties = ["background", "backgroundImage", "mask", "maskImage", "listStyle", "listStyleImage", "borderImage", "borderImageSource", "cursor"];
+const cssProperties = [
+	"background",
+	"background-image",
+	"mask",
+	"mask-image",
+	"list-style",
+	"list-style-image",
+	"border-image",
+	"border-image-source",
+	"cursor",
+];
+// const jsProperties = ["background", "backgroundImage", "mask", "maskImage", "listStyle", "listStyleImage", "borderImage", "borderImageSource", "cursor"];
 
-
-CSSStyleDeclaration.prototype.setProperty = new Proxy(CSSStyleDeclaration.prototype.setProperty, {
+CSSStyleDeclaration.prototype.setProperty = new Proxy(
+	CSSStyleDeclaration.prototype.setProperty,
+	{
 		apply(target, thisArg, argArray) {
-        if (cssProperties.includes(argArray[0])) argArray[1] = rewriteCss(argArray[1]);
+			if (cssProperties.includes(argArray[0]))
+				argArray[1] = rewriteCss(argArray[1]);
 
 			return Reflect.apply(target, thisArg, argArray);
 		},
-});
-
-jsProperties.forEach((prop) => {
-    const propDescriptor = Object.getOwnPropertyDescriptor(CSSStyleDeclaration.prototype, prop);
-
-    Object.defineProperty(CSSStyleDeclaration.prototype, prop, {
-        get() {
-            return propDescriptor.get.call(this);
-        },
-        set(v) {
-            return propDescriptor.set.call(this, rewriteCss(v));
-        },
-    })
-});
+	}
+);

src/client/element.ts

@@ -1,18 +1,31 @@
-import { encodeUrl, rewriteCss, rewriteHtml, rewriteJs, rewriteSrcset } from "../shared";
+import { decodeUrl } from "../shared/rewriters/url";
+import {
+	encodeUrl,
+	rewriteCss,
+	rewriteHtml,
+	rewriteJs,
+	rewriteSrcset,
+} from "./shared";
 
 const attrObject = {
-    "nonce": [HTMLElement],
-    "integrity": [HTMLScriptElement, HTMLLinkElement],
-    "csp": [HTMLIFrameElement],
-    "src": [HTMLImageElement, HTMLMediaElement, HTMLIFrameElement, HTMLEmbedElement, HTMLScriptElement],
-    "href": [HTMLAnchorElement, HTMLLinkElement],
-    "data": [HTMLObjectElement],
-    "action": [HTMLFormElement],
-    "formaction": [HTMLButtonElement, HTMLInputElement],
-    "srcdoc": [HTMLIFrameElement],
-    "srcset": [HTMLImageElement, HTMLSourceElement],
-    "imagesrcset": [HTMLLinkElement]
-}
+	nonce: [HTMLElement],
+	integrity: [HTMLScriptElement, HTMLLinkElement],
+	csp: [HTMLIFrameElement],
+	src: [
+		HTMLImageElement,
+		HTMLMediaElement,
+		HTMLIFrameElement,
+		HTMLEmbedElement,
+		HTMLScriptElement,
+	],
+	href: [HTMLAnchorElement, HTMLLinkElement],
+	data: [HTMLObjectElement],
+	action: [HTMLFormElement],
+	formaction: [HTMLButtonElement, HTMLInputElement],
+	srcdoc: [HTMLIFrameElement],
+	srcset: [HTMLImageElement, HTMLSourceElement],
+	imagesrcset: [HTMLLinkElement],
+};
 
 const attrs = Object.keys(attrObject);
 
@@ -21,19 +34,23 @@ for (const attr of attrs) {
 		const descriptor = Object.getOwnPropertyDescriptor(element.prototype, attr);
 		Object.defineProperty(element.prototype, attr, {
 			get() {
-                return this.dataset[attr];
+				if (/src|href|data|action|formaction/.test(attr)) {
+					return decodeUrl(descriptor.get.call(this));
+				}
+
+				if (this.__origattrs[attr]) {
+					return this.__origattrs[attr];
+				}
+
+				return descriptor.get.call(this);
 			},
 
 			set(value) {
-                this.dataset[attr] = value;
+				this.__origattrs[attr] = value;
+
 				if (/nonce|integrity|csp/.test(attr)) {
 					return;
 				} else if (/src|href|data|action|formaction/.test(attr)) {
-                    // @ts-expect-error
-                    if (value instanceof TrustedScriptURL) {
-                        return;
-                    }
-
 					value = encodeUrl(value);
 				} else if (attr === "srcdoc") {
 					value = rewriteHtml(value);
@@ -47,10 +64,18 @@ for (const attr of attrs) {
 	}
 }
 
+declare global {
+	interface Element {
+		__origattrs: Record<string, string>;
+	}
+}
+
+Element.prototype.__origattrs = {};
+
 Element.prototype.getAttribute = new Proxy(Element.prototype.getAttribute, {
 	apply(target, thisArg, argArray) {
-        if (attrs.includes(argArray[0]) && thisArg.dataset[argArray[0]]) {
-            return thisArg.dataset[argArray[0]];
+		if (attrs.includes(argArray[0]) && thisArg.__origattrs[argArray[0]]) {
+			return thisArg.__origattrs[argArray[0]];
 		}
 
 		return Reflect.apply(target, thisArg, argArray);
@@ -60,11 +85,10 @@ Element.prototype.getAttribute = new Proxy(Element.prototype.getAttribute, {
 Element.prototype.setAttribute = new Proxy(Element.prototype.setAttribute, {
 	apply(target, thisArg, argArray) {
 		if (attrs.includes(argArray[0])) {
-            thisArg.dataset[argArray[0]] = argArray[1];
+			thisArg.__origattrs[argArray[0]] = argArray[1];
 			if (/nonce|integrity|csp/.test(argArray[0])) {
 				return;
 			} else if (/src|href|data|action|formaction/.test(argArray[0])) {
-                console.log(thisArg);
 				argArray[1] = encodeUrl(argArray[1]);
 			} else if (argArray[0] === "srcdoc") {
 				argArray[1] = rewriteHtml(argArray[1]);
@@ -79,20 +103,21 @@ Element.prototype.setAttribute = new Proxy(Element.prototype.setAttribute, {
 	},
 });
 
-const innerHTML = Object.getOwnPropertyDescriptor(Element.prototype, "innerHTML");
+const innerHTML = Object.getOwnPropertyDescriptor(
+	Element.prototype,
+	"innerHTML"
+);
 
 Object.defineProperty(Element.prototype, "innerHTML", {
 	set(value) {
-        // @ts-expect-error
-        if (this instanceof HTMLScriptElement && !(value instanceof TrustedScript)) {
+		if (
+			this instanceof HTMLScriptElement
+		) {
 			value = rewriteJs(value);
 		} else if (this instanceof HTMLStyleElement) {
 			value = rewriteCss(value);
-        // @ts-expect-error
-        } else if (!(value instanceof TrustedHTML)) {
-            value = rewriteHtml(value);
 		}
 
 		return innerHTML.set.call(this, value);
 	},
-})
+});

src/client/history.ts

@@ -1,18 +1,16 @@
-
-import { encodeUrl } from "../shared";
+import { decodeUrl } from "./shared";
 
 window.history.pushState = new Proxy(window.history.pushState, {
 	apply(target, thisArg, argArray) {
-        argArray[3] = encodeUrl(argArray[3]);
+		argArray[3] = decodeUrl(argArray[3]);
 
 		return Reflect.apply(target, thisArg, argArray);
 	},
 });
 
-
 window.history.replaceState = new Proxy(window.history.replaceState, {
 	apply(target, thisArg, argArray) {
-        argArray[3] = encodeUrl(argArray[3]);
+		argArray[3] = decodeUrl(argArray[3]);
 
 		return Reflect.apply(target, thisArg, argArray);
 	},

src/client/index.ts

@@ -1,3 +1,4 @@
+import "./scope.ts";
 import "./window.ts";
 import "./event.ts";
 import "./native/eval.ts";
@@ -5,34 +6,16 @@ import "./location.ts";
 import "./trustedTypes.ts";
 import "./requests/fetch.ts";
 import "./requests/xmlhttprequest.ts";
-import "./requests/websocket.ts"
+import "./requests/websocket.ts";
 import "./element.ts";
 import "./storage.ts";
 import "./css.ts";
-import "./history.ts"
+import "./history.ts";
 import "./worker.ts";
-import "./scope.ts";
+import "./url.ts";
 
 declare global {
 	interface Window {
-        //@ts-ignore scope function cant be typed
-        __s: any;
+		$s: any;
 	}
 }
-
-const scripts = document.querySelectorAll("script:not([data-scramjet])");
-
-for (const script of scripts) {
-    const clone = document.createElement("script");
-
-    for (const attr of Array.from(script.attributes)) {
-        clone.setAttribute(attr.name, attr.value);
-    }
-
-    if (script.innerHTML !== "") {
-        clone.innerHTML = script.innerHTML;
-    }
-
-    script.insertAdjacentElement("afterend", clone);
-    script.remove();
-}

src/client/location.ts

@@ -1,18 +1,26 @@
 // @ts-nocheck
-import { encodeUrl, decodeUrl } from "../shared";
+import { encodeUrl, decodeUrl } from "./shared";
 
-const loc = new URL(decodeUrl(location.href));
-loc.assign = (url: string) => location.assign(encodeUrl(url));
-loc.reload = () => location.reload();
-loc.replace = (url: string) => location.replace(encodeUrl(url));
-loc.toString = () => loc.href;
+function createLocation() {
+	const loc = new URL(decodeUrl(location.href));
+	loc.assign = (url: string) => location.assign(encodeUrl(url));
+	loc.reload = () => location.reload();
+	loc.replace = (url: string) => location.replace(encodeUrl(url));
+	loc.toString = () => loc.href;
+
+	return loc;
+}
 
 export const locationProxy = new Proxy(window.location, {
 	get(target, prop) {
+		const loc = createLocation();
+
 		return loc[prop];
 	},
 
 	set(obj, prop, value) {
+		const loc = createLocation();
+
 		if (prop === "href") {
 			location.href = encodeUrl(value);
 		} else {
@@ -20,6 +28,5 @@ export const locationProxy = new Proxy(window.location, {
 		}
 
 		return true;
-    }
-})
-
+	},
+});

src/client/native/eval.ts

@@ -1,18 +1,24 @@
-import { rewriteJs } from "../../shared";
+import { rewriteJs } from "../shared";
 
 const FunctionProxy = new Proxy(Function, {
 	construct(target, argArray) {
 		if (argArray.length === 1) {
 			return Reflect.construct(target, rewriteJs(argArray[0]));
 		} else {
-            return Reflect.construct(target, rewriteJs(argArray[argArray.length - 1]))
+			return Reflect.construct(
+				target,
+				rewriteJs(argArray[argArray.length - 1])
+			);
 		}
 	},
 	apply(target, thisArg, argArray) {
 		if (argArray.length === 1) {
-            return Reflect.apply(target, undefined, rewriteJs(argArray[0]));
+			return Reflect.apply(target, undefined, [rewriteJs(argArray[0])]);
 		} else {
-            return Reflect.apply(target, undefined, [...argArray.map((x, index) => index === argArray.length - 1), rewriteJs(argArray[argArray.length - 1])])
+			return Reflect.apply(target, undefined, [
+				...argArray.map((x, index) => index === argArray.length - 1),
+				rewriteJs(argArray[argArray.length - 1]),
+			]);
 		}
 	},
 });
@@ -21,8 +27,8 @@ delete window.Function;
 
 window.Function = FunctionProxy;
 
-delete window.eval;
-
-// since the function proxy is already rewriting the js we can just reuse it for the eval proxy
-
-window.eval = (str: string) => window.Function(str);
+window.eval = new Proxy(window.eval, {
+	apply(target, thisArg, argArray) {
+		return Reflect.apply(target, thisArg, [rewriteJs(argArray[0])]);
+	},
+});

src/client/requests/fetch.ts

@@ -1,6 +1,6 @@
 // ts throws an error if you dont do window.fetch
 
-import { encodeUrl, rewriteHeaders } from "../../shared";
+import { encodeUrl, rewriteHeaders } from "../shared";
 
 window.fetch = new Proxy(window.fetch, {
 	apply(target, thisArg, argArray) {
@@ -16,7 +16,7 @@ Headers = new Proxy(Headers, {
 
 		return Reflect.construct(target, argArray, newTarget);
 	},
-})
+});
 
 Request = new Proxy(Request, {
 	construct(target, argArray, newTarget) {

src/client/requests/websocket.ts

@@ -1,5 +1,6 @@
-import { BareClient } from "@mercuryworkshop/bare-mux"
-const client = new BareClient()
+import { BareClient } from "../shared";
+const client = new BareClient();
+
 WebSocket = new Proxy(WebSocket, {
 	construct(target, args) {
 		return client.createWebSocket(
@@ -7,9 +8,9 @@ WebSocket = new Proxy(WebSocket, {
 			args[1],
 			target,
 			{
-                "User-Agent": navigator.userAgent
+				"User-Agent": navigator.userAgent,
 			},
 			ArrayBuffer.prototype
-        )
-    }
+		);
+	},
 });

src/client/requests/xmlhttprequest.ts

@@ -1,4 +1,4 @@
-import { encodeUrl, rewriteHeaders } from "../../shared";
+import { encodeUrl, rewriteHeaders } from "../shared";
 
 XMLHttpRequest.prototype.open = new Proxy(XMLHttpRequest.prototype.open, {
 	apply(target, thisArg, argArray) {
@@ -8,7 +8,9 @@ XMLHttpRequest.prototype.open = new Proxy(XMLHttpRequest.prototype.open, {
 	},
 });
 
-XMLHttpRequest.prototype.setRequestHeader = new Proxy(XMLHttpRequest.prototype.setRequestHeader, {
+XMLHttpRequest.prototype.setRequestHeader = new Proxy(
+	XMLHttpRequest.prototype.setRequestHeader,
+	{
 		apply(target, thisArg, argArray) {
 			let headerObject = Object.fromEntries([argArray]);
 			headerObject = rewriteHeaders(headerObject);
@@ -17,4 +19,5 @@ XMLHttpRequest.prototype.setRequestHeader = new Proxy(XMLHttpRequest.prototype.s
 
 			return Reflect.apply(target, thisArg, argArray);
 		},
-});
+	}
+);

src/client/scope.ts

@@ -12,4 +12,4 @@ function scope(identifier: any) {
 }
 
 // shorthand because this can get out of hand reall quickly
-window.__s = scope;
+window.$s = scope;

src/client/shared.ts

@@ -0,0 +1,12 @@
+export const {
+	util: { isScramjetFile, BareClient },
+	url: { encodeUrl, decodeUrl },
+	rewrite: {
+		rewriteCss,
+		rewriteHtml,
+		rewriteSrcset,
+		rewriteJs,
+		rewriteHeaders,
+		rewriteWorkers,
+	},
+} = self.$scramjet.shared;

src/client/storage.ts

@@ -3,43 +3,42 @@ import { locationProxy } from "./location";
 
 const store = new IDBMapSync(locationProxy.host, {
 	prefix: "Storage",
-	durability: "relaxed"
+	durability: "relaxed",
 });
 
 await store.sync();
 
 function storageProxy(scope: Storage): Storage {
-
 	return new Proxy(scope, {
 		get(target, prop) {
 			switch (prop) {
 				case "getItem":
 					return (key: string) => {
 						return store.get(key);
-					}
+					};
 
 				case "setItem":
 					return (key: string, value: string) => {
 						store.set(key, value);
 						store.sync();
-					}
+					};
 
 				case "removeItem":
 					return (key: string) => {
 						store.delete(key);
 						store.sync();
-					}
+					};
 
 				case "clear":
 					return () => {
 						store.clear();
 						store.sync();
-					}
+					};
 
 				case "key":
 					return (index: number) => {
 						store.keys()[index];
-					}
+					};
 				case "length":
 					return store.size;
 				default:
@@ -58,7 +57,7 @@ function storageProxy(scope: Storage): Storage {
 
 			return true;
 		},
-	})
+	});
 }
 
 const localStorageProxy = storageProxy(window.localStorage);

src/client/trustedTypes.ts

@@ -1,32 +1,40 @@
-import { rewriteHtml, rewriteJs, encodeUrl } from "../shared";
+// import { rewriteHtml, rewriteJs, encodeUrl } from "./shared";
 
-// @ts-expect-error
-trustedTypes.createPolicy = new Proxy(trustedTypes.createPolicy, {
-    apply(target, thisArg, argArray) {
-        if (argArray[1].createHTML) {
-            argArray[1].createHTML = new Proxy(argArray[1].createHTML, {
-                apply(target1, thisArg1, argArray1) {
-                    return rewriteHtml(target1(...argArray1));
-                },
-            });
-        }
+// trustedTypes.createPolicy = new Proxy(trustedTypes.createPolicy, {
+// 	apply(target, thisArg, argArray) {
+// 		if (argArray[1].createHTML) {
+// 			argArray[1].createHTML = new Proxy(argArray[1].createHTML, {
+// 				apply(target1, thisArg1, argArray1) {
+// 					return rewriteHtml(target1(...argArray1));
+// 				},
+// 			});
+// 		}
+//
+// 		if (argArray[1].createScript) {
+// 			argArray[1].createScript = new Proxy(argArray[1].createScript, {
+// 				apply(target1, thisArg1, argArray1) {
+// 					return rewriteJs(target1(...argArray1));
+// 				},
+// 			});
+// 		}
+//
+// 		if (argArray[1].createScriptURL) {
+// 			argArray[1].createScriptURL = new Proxy(argArray[1].createScriptURL, {
+// 				apply(target1, thisArg1, argArray1) {
+// 					return encodeUrl(target1(...argArray1));
+// 				},
+// 			});
+// 		}
+//
+// 		return Reflect.apply(target, thisArg, argArray);
+// 	},
+// });
 
-        if (argArray[1].createScript) {
-            argArray[1].createScript = new Proxy(argArray[1].createScript, {
-                apply(target1, thisArg1, argArray1) {
-                    return rewriteJs(target1(...argArray1));
-                },
-            });
-        }
+//@ts-nocheck
+delete window.TrustedHTML;
+delete window.TrustedScript;
+delete window.TrustedScriptURL;
+delete window.TrustedTypePolicy;
+delete window.TrustedTypePolicyFactory;
+delete window.trustedTypes;
 
-        if (argArray[1].createScriptURL) {
-            argArray[1].createScriptURL = new Proxy(argArray[1].createScriptURL, {
-                apply(target1, thisArg1, argArray1) {
-                    return encodeUrl(target1(...argArray1));
-                },
-            })
-        }
-
-        return Reflect.apply(target, thisArg, argArray);
-    },
-})

src/client/url.ts

@@ -0,0 +1,13 @@
+import { encodeUrl } from "../shared/rewriters/url";
+export const URL = globalThis.URL;
+
+if (globalThis.window) {
+	window.URL = new Proxy(URL, {
+		construct(target, argArray, newTarget) {
+			if (typeof argArray[0] === "string") argArray[0] = encodeUrl(argArray[0]);
+			if (typeof argArray[1] === "string") argArray[1] = encodeUrl(argArray[1]);
+
+			return Reflect.construct(target, argArray, newTarget);
+		},
+	});
+}

src/client/window.ts

@@ -5,16 +5,40 @@ export const windowProxy = new Proxy(window, {
 		const propIsString = typeof prop === "string";
 		if (propIsString && prop === "location") {
 			return locationProxy;
-        } else if (propIsString && ["window", "top", "parent", "self", "globalThis"].includes(prop)) {
+		} else if (
+			propIsString &&
+			["window", "top", "parent", "self", "globalThis"].includes(prop)
+		) {
 			return windowProxy;
+		} else if (propIsString && prop === "$scramjet") {
+			return;
+		} else if (propIsString && prop === "addEventListener") {
+			console.log("addEventListener getteetetetetet");
+
+			return new Proxy(window.addEventListener, {
+				apply(target1, thisArg, argArray) {
+					window.addEventListener(argArray[0], argArray[1]);
+				},
+			});
 		}
 
-        return target[prop];
+		const value = Reflect.get(target, prop);
+
+		if (typeof value === "function") {
+			return value.bind(target);
+		}
+
+		return value;
 	},
 
 	set(target, prop, newValue) {
 		// ensures that no apis are overwritten
-        if (typeof prop === "string" && ["window", "top", "parent", "self", "globalThis", "location"].includes(prop)) {
+		if (
+			typeof prop === "string" &&
+			["window", "top", "parent", "self", "globalThis", "location"].includes(
+				prop
+			)
+		) {
 			return false;
 		}
 

src/client/worker.ts

@@ -1,4 +1,4 @@
-import { encodeUrl } from "../shared";
+import { encodeUrl } from "./shared";
 
 Worker = new Proxy(Worker, {
 	construct(target, argArray) {
@@ -9,23 +9,25 @@ Worker = new Proxy(Worker, {
 		// you could do new target(...argArray) and it would work the same effectively
 
 		return Reflect.construct(target, argArray);
-    }
-})
+	},
+});
 
 Worklet.prototype.addModule = new Proxy(Worklet.prototype.addModule, {
 	apply(target, thisArg, argArray) {
-        argArray[0] = encodeUrl(argArray[0])
+		argArray[0] = encodeUrl(argArray[0]);
 
 		return Reflect.apply(target, thisArg, argArray);
 	},
 });
 
-window.importScripts = new Proxy(window.importScripts, {
-    apply(target, thisArg, argArray) {
-        for (const i in argArray) {
-            argArray[i] = encodeUrl(argArray[i]);
-        }
+// broken
 
-        return Reflect.apply(target, thisArg, argArray);
-    },
-});
+// window.importScripts = new Proxy(window.importScripts, {
+//     apply(target, thisArg, argArray) {
+//         for (const i in argArray) {
+//             argArray[i] = encodeUrl(argArray[i]);
+//         }
+
+//         return Reflect.apply(target, thisArg, argArray);
+//     },
+// });

src/codecs/aes.ts

@@ -9,14 +9,14 @@ function enc_utf8(s) {
 	} catch (e) {
 		throw "Error on UTF-8 encode";
 	}
-};
+}
 function dec_utf8(s) {
 	try {
 		return decodeURIComponent(escape(s));
 	} catch (e) {
 		throw "Bad Key";
 	}
-};
+}
 function padBlock(byteArr) {
 	var array = [],
 		cpad,
@@ -46,7 +46,7 @@ function padBlock(byteArr) {
 		array[i] = byteArr[i];
 	}
 	return array;
-};
+}
 function block2s(block, lastBlock) {
 	var string = "",
 		padding,
@@ -68,7 +68,7 @@ function block2s(block, lastBlock) {
 		}
 	}
 	return string;
-};
+}
 function a2h(numArr) {
 	var string = "",
 		i;
@@ -76,14 +76,14 @@ function a2h(numArr) {
 		string += (numArr[i] < 16 ? "0" : "") + numArr[i].toString(16);
 	}
 	return string;
-};
+}
 function h2a(s) {
 	var ret = [];
 	s.replace(/(..)/g, function (s) {
 		ret.push(parseInt(s, 16));
 	});
 	return ret;
-};
+}
 function s2a(string, binary) {
 	var array = [],
 		i;
@@ -97,7 +97,7 @@ function s2a(string, binary) {
 	}
 
 	return array;
-};
+}
 function size(newsize) {
 	switch (newsize) {
 		case 128:
@@ -115,7 +115,7 @@ function size(newsize) {
 		default:
 			throw "Invalid Key Size Specified:" + newsize;
 	}
-};
+}
 function randArr(num) {
 	var result = [],
 		i;
@@ -123,7 +123,7 @@ function randArr(num) {
 		result = result.concat(Math.floor(Math.random() * 256));
 	}
 	return result;
-};
+}
 function openSSLKey(passwordArr, saltArr) {
 	var rounds = Nr >= 12 ? 3 : 2,
 		key = [],
@@ -144,7 +144,7 @@ function openSSLKey(passwordArr, saltArr) {
 		key: key,
 		iv: iv,
 	};
-};
+}
 function rawEncrypt(plaintext, key, iv) {
 	key = expandKey(key);
 	var numBlocks = Math.ceil(plaintext.length / 16),
@@ -168,7 +168,7 @@ function rawEncrypt(plaintext, key, iv) {
 		cipherBlocks[i] = encryptBlock(blocks[i], key);
 	}
 	return cipherBlocks;
-};
+}
 function rawDecrypt(cryptArr, key, iv, binary) {
 	key = expandKey(key);
 	var numBlocks = cryptArr.length / 16,
@@ -191,7 +191,7 @@ function rawDecrypt(cryptArr, key, iv, binary) {
 	}
 	string += block2s(plainBlocks[i], true);
 	return binary ? string : dec_utf8(string);
-};
+}
 function encryptBlock(block, words) {
 	Decrypt = false;
 	var state = addRoundKey(block, words, 0),
@@ -206,7 +206,7 @@ function encryptBlock(block, words) {
 	}
 
 	return state;
-};
+}
 function decryptBlock(block, words) {
 	Decrypt = true;
 	var state = addRoundKey(block, words, Nr),
@@ -221,7 +221,7 @@ function decryptBlock(block, words) {
 	}
 
 	return state;
-};
+}
 function subBytes(state) {
 	var S = Decrypt ? SBoxInv : SBox,
 		temp = [],
@@ -230,7 +230,7 @@ function subBytes(state) {
 		temp[i] = S[state[i]];
 	}
 	return temp;
-};
+}
 function shiftRows(state) {
 	var temp = [],
 		shiftBy = Decrypt
@@ -241,7 +241,7 @@ function shiftRows(state) {
 		temp[i] = state[shiftBy[i]];
 	}
 	return temp;
-};
+}
 function mixColumns(state) {
 	var t = [],
 		c;
@@ -294,7 +294,7 @@ function mixColumns(state) {
 	}
 
 	return t;
-};
+}
 function addRoundKey(state, words, round) {
 	var temp = [],
 		i;
@@ -302,7 +302,7 @@ function addRoundKey(state, words, round) {
 		temp[i] = state[i] ^ words[round][i];
 	}
 	return temp;
-};
+}
 function xorBlocks(block1, block2) {
 	var temp = [],
 		i;
@@ -310,7 +310,7 @@ function xorBlocks(block1, block2) {
 		temp[i] = block1[i] ^ block2[i];
 	}
 	return temp;
-};
+}
 function expandKey(key) {
 	var w = [],
 		temp = [],
@@ -352,13 +352,13 @@ function expandKey(key) {
 		}
 	}
 	return flat;
-};
+}
 function subWord(w) {
 	for (var i = 0; i < 4; i++) {
 		w[i] = SBox[w[i]];
 	}
 	return w;
-};
+}
 function rotWord(w) {
 	var tmp = w[0],
 		i;
@@ -367,7 +367,7 @@ function rotWord(w) {
 	}
 	w[3] = tmp;
 	return w;
-};
+}
 function strhex(str, size) {
 	var i,
 		ret = [];
@@ -375,7 +375,7 @@ function strhex(str, size) {
 		ret[i / size] = parseInt(str.substr(i, size), 16);
 	}
 	return ret;
-};
+}
 function invertArr(arr) {
 	var i,
 		ret = [];
@@ -383,7 +383,7 @@ function invertArr(arr) {
 		ret[arr[i]] = i;
 	}
 	return ret;
-};
+}
 function Gxx(a, b) {
 	var i, ret;
 
@@ -395,7 +395,7 @@ function Gxx(a, b) {
 	}
 
 	return ret;
-};
+}
 function Gx(x) {
 	var i,
 		r = [];
@@ -403,7 +403,7 @@ function Gx(x) {
 		r[i] = Gxx(x, i);
 	}
 	return r;
-};
+}
 var SBox = strhex(
 	"637c777bf26b6fc53001672bfed7ab76ca82c97dfa5947f0add4a2af9ca472c0b7fd9326363ff7cc34a5e5f171d8311504c723c31896059a071280e2eb27b27509832c1a1b6e5aa0523bd6b329e32f8453d100ed20fcb15b6acbbe394a4c58cfd0efaafb434d338545f9027f503c9fa851a3408f929d38f5bcb6da2110fff3d2cd0c13ec5f974417c4a77e3d645d197360814fdc222a908846eeb814de5e0bdbe0323a0a4906245cc2d3ac629195e479e7c8376d8dd54ea96c56f4ea657aae08ba78252e1ca6b4c6e8dd741f4bbd8b8a703eb5664803f60e613557b986c11d9ee1f8981169d98e949b1e87e9ce5528df8ca1890dbfe6426841992d0fb054bb16",
 	2
@@ -431,7 +431,7 @@ function enc(string, pass, binary) {
 
 	cipherBlocks = saltBlock.concat(cipherBlocks);
 	return Base64.encode(cipherBlocks);
-};
+}
 function dec(string, pass, binary) {
 	var cryptArr = Base64.decode(string),
 		salt = cryptArr.slice(8, 16),
@@ -442,7 +442,7 @@ function dec(string, pass, binary) {
 
 	string = rawDecrypt(cryptArr, key, iv, binary);
 	return string;
-};
+}
 function MD5(numArr) {
 	function rotateLeft(lValue, iShiftBits) {
 		return (lValue << iShiftBits) | (lValue >>> (32 - iShiftBits));
@@ -636,7 +636,7 @@ function MD5(numArr) {
 	}
 
 	return wordToHex(a).concat(wordToHex(b), wordToHex(c), wordToHex(d));
-};
+}
 // function encString (plaintext, key, iv) {
 //   var i;
 //   plaintext = s2a(plaintext, false);
@@ -799,7 +799,7 @@ const Base64 = {
 		}
 		flatArr = flatArr.slice(0, flatArr.length - (flatArr.length % 16));
 		return flatArr;
-  }
-}
+	},
+};
 
 export { enc, dec };

src/codecs/index.ts

@@ -12,14 +12,24 @@ const xor = {
 	encode: (str: string | undefined, key: number = 2) => {
 		if (!str) return str;
 
-        return encodeURIComponent(str.split("").map((e, i) => i % key ? String.fromCharCode(e.charCodeAt(0) ^ key) : e).join(""));
+		return encodeURIComponent(
+			str
+				.split("")
+				.map((e, i) =>
+					i % key ? String.fromCharCode(e.charCodeAt(0) ^ key) : e
+				)
+				.join("")
+		);
 	},
 	decode: (str: string | undefined, key: number = 2) => {
 		if (!str) return str;
 
-        return decodeURIComponent(str).split("").map((e, i) => i % key ? String.fromCharCode(e.charCodeAt(0) ^ key) : e).join("");
-    }
-}
+		return decodeURIComponent(str)
+			.split("")
+			.map((e, i) => (i % key ? String.fromCharCode(e.charCodeAt(0) ^ key) : e))
+			.join("");
+	},
+};
 
 const plain = {
 	encode: (str: string | undefined) => {
@@ -31,8 +41,8 @@ const plain = {
 		if (!str) return str;
 
 		return decodeURIComponent(str);
-    }
-}
+	},
+};
 
 /*
 const aes = {
@@ -52,7 +62,7 @@ const aes = {
 const none = {
 	encode: (str: string | undefined) => str,
 	decode: (str: string | undefined) => str,
-}
+};
 
 const base64 = {
 	encode: (str: string | undefined) => {
@@ -64,20 +74,16 @@ const base64 = {
 		if (!str) return str;
 
 		return atob(str);
-    }
-}
+	},
+};
 
-declare global {
-    interface Window {
-        __scramjet$codecs: {
-            none: Codec;
-            plain: Codec;
-            base64: Codec;
-            xor: Codec;
-        }
-    }
-}
-
-self.__scramjet$codecs = {
-    none, plain, base64, xor
+if (!self.$scramjet) {
+	//@ts-expect-error really dumb workaround
+	self.$scramjet = {};
 }
+self.$scramjet.codecs = {
+	none,
+	plain,
+	base64,
+	xor,
+};

src/scramjet.config.ts

@@ -1,25 +1,13 @@
-import { Codec } from "./codecs";
-
-declare global {
-    interface Window {
-        __scramjet$config: {
-            prefix: string;
-            codec: Codec
-            config: string;
-            shared: string;
-            worker: string;
-            client: string;
-            codecs: string;
-        }
-    }
+if (!self.$scramjet) {
+	//@ts-expect-error really dumb workaround
+	self.$scramjet = {};
 }
-
-self.__scramjet$config = {
+self.$scramjet.config = {
 	prefix: "/scramjet/",
-    codec: self.__scramjet$codecs.plain,
+	codec: self.$scramjet.codecs.plain,
 	config: "/scram/scramjet.config.js",
 	shared: "/scram/scramjet.shared.js",
 	worker: "/scram/scramjet.worker.js",
 	client: "/scram/scramjet.client.js",
-    codecs: "/scram/scramjet.codecs.js"
-}
+	codecs: "/scram/scramjet.codecs.js",
+};

src/shared/index.ts

@@ -1,16 +1,33 @@
-export { encodeUrl, decodeUrl } from "./rewriters/url";
-export { rewriteCss } from "./rewriters/css";
-export { rewriteHtml, rewriteSrcset } from "./rewriters/html";
-export { rewriteJs } from "./rewriters/js";
-export { rewriteHeaders } from "./rewriters/headers";
-export { rewriteWorkers } from "./rewriters/worker"
-export { BareClient } from "@mercuryworkshop/bare-mux"
+import { encodeUrl, decodeUrl } from "./rewriters/url";
+import { rewriteCss } from "./rewriters/css";
+import { rewriteHtml, rewriteSrcset } from "./rewriters/html";
+import { rewriteJs } from "./rewriters/js";
+import { rewriteHeaders } from "./rewriters/headers";
+import { rewriteWorkers } from "./rewriters/worker";
+import { isScramjetFile } from "./rewriters/html";
+import { BareClient } from "@mercuryworkshop/bare-mux";
+import { parseDomain } from "parse-domain";
 
-export function isScramjetFile(src: string) {
-    let bool = false;
-    ["codecs", "client", "shared", "worker", "config"].forEach((file) => {
-        if (src === self.__scramjet$config[file]) bool = true;
-    });
-
-    return bool;
+if (!self.$scramjet) {
+	//@ts-expect-error really dumb workaround
+	self.$scramjet = {};
 }
+self.$scramjet.shared = {
+	util: {
+		isScramjetFile,
+		parseDomain,
+		BareClient,
+	},
+	url: {
+		encodeUrl,
+		decodeUrl,
+	},
+	rewrite: {
+		rewriteCss,
+		rewriteHtml,
+		rewriteSrcset,
+		rewriteJs,
+		rewriteHeaders,
+		rewriteWorkers,
+	},
+};

src/shared/rewriters/css.ts

@@ -5,7 +5,7 @@ import { encodeUrl } from "./url";
 
 export function rewriteCss(css: string, origin?: URL) {
 	const regex =
-    /(@import\s+(?!url\())?\s*url\(\s*(['"]?)([^'")]+)\2\s*\)|@import\s+(['"])([^'"]+)\4/g
+		/(@import\s+(?!url\())?\s*url\(\s*(['"]?)([^'")]+)\2\s*\)|@import\s+(['"])([^'"]+)\4/g;
 
 	return css.replace(
 		regex,
@@ -17,19 +17,18 @@ export function rewriteCss(css: string, origin?: URL) {
 			importQuote,
 			importContent
 		) => {
-            const url = urlContent || importContent
-            const encodedUrl = encodeUrl(url.trim(), origin)
+			const url = urlContent || importContent;
+			const encodedUrl = encodeUrl(url.trim(), origin);
 
 			if (importStatement) {
-                return `@import url(${urlQuote}${encodedUrl}${urlQuote})`
+				return `@import url(${urlQuote}${encodedUrl}${urlQuote})`;
 			}
 
 			if (importQuote) {
-                return `@import ${importQuote}${encodedUrl}${importQuote}`
+				return `@import ${importQuote}${encodedUrl}${importQuote}`;
 			}
 
-            return `url(${urlQuote}${encodedUrl}${urlQuote})`
+			return `url(${urlQuote}${encodedUrl}${urlQuote})`;
 		}
-    )
-
+	);
 }

src/shared/rewriters/headers.ts

@@ -19,14 +19,10 @@ const cspHeaders = [
 	"x-xss-protection",
 	// This needs to be emulated, but for right now it isn't that important of a feature to be worried about
 	// https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Clear-Site-Data
-    "clear-site-data"
+	"clear-site-data",
 ];
 
-const urlHeaders = [
-    "location",
-    "content-location",
-    "referer"
-];
+const urlHeaders = ["location", "content-location", "referer"];
 
 export function rewriteHeaders(rawHeaders: BareHeaders, origin?: URL) {
 	const headers = {};
@@ -45,7 +41,9 @@ export function rewriteHeaders(rawHeaders: BareHeaders, origin?: URL) {
 	});
 
 	if (headers["link"]) {
-        headers["link"] = headers["link"].replace(/<(.*?)>/gi, (match) => encodeUrl(match, origin));
+		headers["link"] = headers["link"].replace(/<(.*?)>/gi, (match) =>
+			encodeUrl(match, origin)
+		);
 	}
 
 	return headers;

src/shared/rewriters/html.ts

@@ -4,8 +4,16 @@ import { hasAttrib } from "domutils";
 import render from "dom-serializer";
 import { encodeUrl } from "./url";
 import { rewriteCss } from "./css";
-// import { rewriteJs } from "./js";
-import { isScramjetFile } from "..";
+import { rewriteJs } from "./js";
+
+export function isScramjetFile(src: string) {
+	let bool = false;
+	["codecs", "client", "shared", "worker", "config"].forEach((file) => {
+		if (src === self.$scramjet.config[file]) bool = true;
+	});
+
+	return bool;
+}
 
 export function rewriteHtml(html: string, origin?: URL) {
 	const handler = new DomHandler((err, dom) => dom);
@@ -29,7 +37,7 @@ function traverseParsedHtml(node, origin?: URL) {
 	}
 
 	/* url attributes */
-    for (const urlAttr of ["src", "href", "data", "action", "formaction"]) {
+	for (const urlAttr of ["src", "href", "action", "formaction"]) {
 		if (hasAttrib(node, urlAttr) && !isScramjetFile(node.attribs[urlAttr])) {
 			const value = node.attribs[urlAttr];
 			node.attribs[`data-${urlAttr}`] = value;
@@ -46,15 +54,32 @@ function traverseParsedHtml(node, origin?: URL) {
 		}
 	}
 
-    if (hasAttrib(node, "srcdoc")) node.attribs.srcdoc = rewriteHtml(node.attribs.srcdoc, origin);
-    if (hasAttrib(node, "style")) node.attribs.style = rewriteCss(node.attribs.style, origin);
+	if (hasAttrib(node, "srcdoc"))
+		node.attribs.srcdoc = rewriteHtml(node.attribs.srcdoc, origin);
+	if (hasAttrib(node, "style"))
+		node.attribs.style = rewriteCss(node.attribs.style, origin);
 
-    if (node.name === "style" && node.children[0] !== undefined) node.children[0].data = rewriteCss(node.children[0].data, origin);
-    // if (node.name === "script" && /(application|text)\/javascript|importmap|undefined/.test(node.attribs.type) && node.children[0] !== undefined) node.children[0].data = rewriteJs(node.children[0].data, origin);
+	if (node.name === "style" && node.children[0] !== undefined)
+		node.children[0].data = rewriteCss(node.children[0].data, origin);
+	if (
+		node.name === "script" &&
+		/(application|text)\/javascript|importmap|undefined/.test(
+			node.attribs.type
+		) &&
+		node.children[0] !== undefined
+	) {
+		let js = node.children[0].data
+		const htmlcomment = /<!--[\s\S]*?-->/g;
+		js = js.replace(htmlcomment, "");
+		node.children[0].data = rewriteJs(js, origin);
+	}
 	if (node.name === "meta" && hasAttrib(node, "http-equiv")) {
 		if (node.attribs["http-equiv"] === "content-security-policy") {
 			node = {};
-        } else if (node.attribs["http-equiv"] === "refresh" && node.attribs.content.includes("url")) {
+		} else if (
+			node.attribs["http-equiv"] === "refresh" &&
+			node.attribs.content.includes("url")
+		) {
 			const contentArray = node.attribs.content.split("url=");
 			contentArray[1] = encodeUrl(contentArray[1].trim(), origin);
 			node.attribs.content = contentArray.join("url=");
@@ -64,11 +89,12 @@ function traverseParsedHtml(node, origin?: URL) {
 	if (node.name === "head") {
 		const scramjetScripts = [];
 		["codecs", "config", "shared", "client"].forEach((script) => {
-            scramjetScripts.push(new Element("script", {
-                src: self.__scramjet$config[script],
-                type: "module",
-                "data-scramjet": ""
-            }));
+			scramjetScripts.push(
+				new Element("script", {
+					src: self.$scramjet.config[script],
+					"data-scramjet": "",
+				})
+			);
 		});
 
 		node.children.unshift(...scramjetScripts);
@@ -76,7 +102,10 @@ function traverseParsedHtml(node, origin?: URL) {
 
 	if (node.childNodes) {
 		for (const childNode in node.childNodes) {
-            node.childNodes[childNode] = traverseParsedHtml(node.childNodes[childNode], origin);
+			node.childNodes[childNode] = traverseParsedHtml(
+				node.childNodes[childNode],
+				origin
+			);
 		}
 	}
 

src/shared/rewriters/js.ts

@@ -16,12 +16,11 @@ import * as ESTree from "estree";
 // top
 // parent
 
-
 export function rewriteJs(js: string, origin?: URL) {
 	try {
 		const ast = parseModule(js, {
 			module: true,
-            webcompat: true
+			webcompat: true,
 		});
 
 		const identifierList = [
@@ -31,9 +30,8 @@ export function rewriteJs(js: string, origin?: URL) {
 			"this",
 			"parent",
 			"top",
-            "this",
-            "location"
-        ]
+			"location",
+		];
 
 		const customTraveler = makeTraveler({
 			ImportDeclaration: (node: ESTree.ImportDeclaration) => {
@@ -57,21 +55,51 @@ export function rewriteJs(js: string, origin?: URL) {
 
 			ExportNamedDeclaration: (node: ESTree.ExportNamedDeclaration) => {
 				// strings are Literals in ESTree syntax but these will always be strings
-                if (node.source) node.source.value = encodeUrl(node.source.value as string, origin);
+				if (node.source)
+					node.source.value = encodeUrl(node.source.value as string, origin);
 			},
 
-            // js rweriting notrdone
 			MemberExpression: (node: ESTree.MemberExpression) => {
-                if (node.object.type === "Identifier" && identifierList.includes(node.object.name)) {
-                    node.object.name = `__s(${node.object.name})`;
+				if (
+					node.object.type === "Identifier" &&
+					identifierList.includes(node.object.name)
+				) {
+					node.object.name = `globalThis.$s(${node.object.name})`;
 				}
+			},
+
+			AssignmentExpression: (node: ESTree.AssignmentExpression) => {
+				if (
+					node.left.type === "Identifier" &&
+					identifierList.includes(node.left.name)
+				) {
+					node.left.name = `globalThis.$s(${node.left.name})`;
 				}
+
+				if (
+					node.right.type === "Identifier" &&
+					identifierList.includes(node.right.name)
+				) {
+					node.right.name = `globalThis.$s(${node.right.name})`;
+				}
+			},
+
+			VariableDeclarator: (node: ESTree.VariableDeclarator) => {
+				if (
+					node.init &&
+					node.init.type === "Identifier" &&
+					identifierList.includes(node.init.name)
+				) {
+					node.init.name = `globalThis.$s(${node.init.name})`;
+				}
+			},
 		});
 
 		customTraveler.go(ast);
 
 		return generate(ast);
-    } catch {
+	} catch (e) {
+		console.error(e);
 		console.log(js);
 
 		return js;

src/shared/rewriters/url.ts

@@ -1,3 +1,4 @@
+import { URL } from "../../client/url";
 import { rewriteJs } from "./js";
 
 function canParseUrl(url: string, origin?: URL) {
@@ -11,26 +12,49 @@ function canParseUrl(url: string, origin?: URL) {
 }
 
 // something is broken with this but i didn't debug it
-export function encodeUrl(url: string, origin?: URL) {
-    if (!origin) {
-        origin = new URL(self.__scramjet$config.codec.decode(location.href.slice((location.origin + self.__scramjet$config.prefix).length)));
+export function encodeUrl(url: string | URL, origin?: URL) {
+	if (url instanceof URL) {
+		return url.toString();
 	}
 
+	if (!origin) {
+		origin = new URL(
+			self.$scramjet.config.codec.decode(
+				location.href.slice(
+					(location.origin + self.$scramjet.config.prefix).length
+				)
+			)
+		);
+	}
+
+	// is this the correct behavior?
+	if (!url) url = origin.href;
+
 	if (url.startsWith("javascript:")) {
 		return "javascript:" + rewriteJs(url.slice("javascript:".length));
 	} else if (/^(#|mailto|about|data)/.test(url)) {
 		return url;
 	} else if (canParseUrl(url, origin)) {
-        return location.origin + self.__scramjet$config.prefix + self.__scramjet$config.codec.encode(new URL(url, origin).href);
+		return (
+			location.origin +
+			self.$scramjet.config.prefix +
+			self.$scramjet.config.codec.encode(new URL(url, origin).href)
+		);
 	}
 }
 
 // something is also broken with this but i didn't debug it
-export function decodeUrl(url: string) {
+export function decodeUrl(url: string | URL) {
+	if (url instanceof URL) {
+		return url.toString();
+	}
+
 	if (/^(#|about|data|mailto|javascript)/.test(url)) {
 		return url;
 	} else if (canParseUrl(url)) {
-        return self.__scramjet$config.codec.decode(url.slice((location.origin + self.__scramjet$config.prefix).length))
+		return self.$scramjet.config.codec.decode(
+			url.slice((location.origin + self.$scramjet.config.prefix).length)
+		);
 	} else {
 		return url;
 	}

src/shared/rewriters/worker.ts

@@ -1,10 +1,11 @@
 import { rewriteJs } from "./js";
 export function rewriteWorkers(js: string, origin?: URL) {
-    let str = new String().toString()
+	let str = new String().toString()[
 		//@ts-expect-error
-        ["codecs", "config", "shared", "client"].forEach((script) => {
-            str += `import "${self.__scramjet$config[script]}"\n`
-        })
+		("codecs", "config", "shared", "client")
+	].forEach((script) => {
+		str += `import "${self.$scramjet.config[script]}"\n`;
+	});
 	str += rewriteJs(js, origin);
 
 	return str;

src/types.d.ts

@@ -0,0 +1,51 @@
+import { encodeUrl, decodeUrl } from "./shared/rewriters/url";
+import { rewriteCss } from "./shared/rewriters/css";
+import { rewriteHtml, rewriteSrcset } from "./shared/rewriters/html";
+import { rewriteJs } from "./shared/rewriters/js";
+import { rewriteHeaders } from "./shared/rewriters/headers";
+import { rewriteWorkers } from "./shared/rewriters/worker";
+import { isScramjetFile } from "./shared/rewriters/html";
+import type { Codec } from "./codecs";
+import { BareClient } from "@mercuryworkshop/bare-mux";
+import { parseDomain } from "parse-domain";
+
+declare global {
+	interface Window {
+		$scramjet: {
+			shared: {
+				url: {
+					encodeUrl: typeof encodeUrl;
+					decodeUrl: typeof decodeUrl;
+				};
+				rewrite: {
+					rewriteCss: typeof rewriteCss;
+					rewriteHtml: typeof rewriteHtml;
+					rewriteSrcset: typeof rewriteSrcset;
+					rewriteJs: typeof rewriteJs;
+					rewriteHeaders: typeof rewriteHeaders;
+					rewriteWorkers: typeof rewriteWorkers;
+				};
+				util: {
+					BareClient: typeof BareClient;
+					isScramjetFile: typeof isScramjetFile;
+					parseDomain: typeof parseDomain;
+				};
+			};
+			config: {
+				prefix: string;
+				codec: Codec;
+				config: string;
+				shared: string;
+				worker: string;
+				client: string;
+				codecs: string;
+			};
+			codecs: {
+				none: Codec;
+				plain: Codec;
+				base64: Codec;
+				xor: Codec;
+			};
+		};
+	}
+}

src/worker/index.ts

@@ -1,6 +1,7 @@
-import { BareClient } from "@mercuryworkshop/bare-mux";
 import { BareResponseFetch } from "@mercuryworkshop/bare-mux";
-import { encodeUrl, decodeUrl, rewriteCss, rewriteHeaders, rewriteHtml, rewriteJs, rewriteWorkers } from "../shared";
+import IDBMap from "@webreflection/idb-map";
+import { ParseResultType } from "parse-domain";
+import { parse } from "path";
 
 declare global {
 	interface Window {
@@ -8,30 +9,48 @@ declare global {
 	}
 }
 
-export default class ScramjetServiceWorker {
-    client: typeof BareClient.prototype;
-    config: typeof self.__scramjet$config;
-    constructor(config = self.__scramjet$config) {
-        this.client = new BareClient();
+self.ScramjetServiceWorker = class ScramjetServiceWorker {
+	client: typeof self.$scramjet.shared.util.BareClient.prototype;
+	config: typeof self.$scramjet.config;
+
+	constructor(config = self.$scramjet.config) {
+		this.client = new self.$scramjet.shared.util.BareClient();
 		if (!config.prefix) config.prefix = "/scramjet/";
 		this.config = config;
 	}
 
 	route({ request }: FetchEvent) {
-        if (request.url.startsWith(location.origin + this.config.prefix)) return true;
+		if (request.url.startsWith(location.origin + this.config.prefix))
+			return true;
 		else return false;
 	}
 
 	async fetch({ request }: FetchEvent) {
 		const urlParam = new URLSearchParams(new URL(request.url).search);
+		const { encodeUrl, decodeUrl } = self.$scramjet.shared.url;
+		const {
+			rewriteHeaders,
+			rewriteHtml,
+			rewriteJs,
+			rewriteCss,
+			rewriteWorkers,
+		} = self.$scramjet.shared.rewrite;
+		const { parseDomain } = self.$scramjet.shared.util;
 
 		if (urlParam.has("url")) {
-            return Response.redirect(encodeUrl(urlParam.get("url"), new URL(urlParam.get("url"))))
+			return Response.redirect(
+				encodeUrl(urlParam.get("url"), new URL(urlParam.get("url")))
+			);
 		}
 
 		try {
 			const url = new URL(decodeUrl(request.url));
 
+			const cookieStore = new IDBMap(url.host, {
+				durability: "relaxed",
+				prefix: "Cookies",
+			});
+
 			const response: BareResponseFetch = await this.client.fetch(url, {
 				method: request.method,
 				body: request.body,
@@ -40,15 +59,76 @@ export default class ScramjetServiceWorker {
 				mode: request.mode === "cors" ? request.mode : "same-origin",
 				cache: request.cache,
 				redirect: request.redirect,
+				//@ts-ignore why the fuck is this not typed mircosoft
+				duplex: "half",
 			});
 
 			let responseBody;
 			const responseHeaders = rewriteHeaders(response.rawHeaders, url);
+
+			for (const cookie of (responseHeaders["set-cookie"] || []) as string[]) {
+				let cookieParsed = cookie.split(";").map((x) => x.trim().split("="));
+
+				let [key, value] = cookieParsed.shift();
+				value = value.replace('"', "");
+
+				const hostArg = cookieParsed.find((x) => x[0] === "Domain");
+				cookieParsed = cookieParsed.filter((x) => x[0] !== "Domain");
+				let host = hostArg ? hostArg[1] : undefined;
+
+				if (url.protocol === "http" && cookieParsed.includes(["Secure"]))
+					continue;
+				if (
+					cookieParsed.includes(["SameSite", "None"]) &&
+					!cookieParsed.includes(["Secure"])
+				)
+					continue;
+
+				if (host && host !== url.host) {
+					if (host.startsWith(".")) host = host.slice(1);
+					const urlDomain = parseDomain(url.hostname);
+
+					if (urlDomain.type === ParseResultType.Listed) {
+						const { subDomains: _, domain, topLevelDomains } = urlDomain;
+						if (!host.endsWith([domain, ...topLevelDomains].join(".")))
+							continue;
+					} else {
+						continue;
+					}
+
+					const realCookieStore = new IDBMap(host, {
+						durability: "relaxed",
+						prefix: "Cookies",
+					});
+					realCookieStore.set(key, {
+						value: value,
+						args: cookieParsed,
+						subdomain: true,
+					});
+				} else {
+					cookieStore.set(key, {
+						value: value,
+						args: cookieParsed,
+						subdomain: false,
+					});
+				}
+			}
+
+			for (let header in responseHeaders) {
+				// flatten everything past here
+				if (responseHeaders[header] instanceof Array)
+					responseHeaders[header] = responseHeaders[header][0];
+			}
+
 			if (response.body) {
 				switch (request.destination) {
 					case "iframe":
 					case "document":
-                    if (responseHeaders["content-type"].startsWith("text/html")) {
+						if (
+							responseHeaders["content-type"]
+								?.toString()
+								?.startsWith("text/html")
+						) {
 							responseBody = rewriteHtml(await response.text(), url);
 						} else {
 							responseBody = response.body;
@@ -86,9 +166,8 @@ export default class ScramjetServiceWorker {
 						.split("/")
 						.slice(-1);
 
-                    responseHeaders[
-                        "content-disposition"
-                    ] = `${type}; filename=${JSON.stringify(filename)}`;
+					responseHeaders["content-disposition"] =
+						`${type}; filename=${JSON.stringify(filename)}`;
 				}
 			}
 			if (responseHeaders["accept"] === "text/event-stream") {
@@ -101,8 +180,8 @@ export default class ScramjetServiceWorker {
 			return new Response(responseBody, {
 				headers: responseHeaders as HeadersInit,
 				status: response.status,
-                statusText: response.statusText
-            })
+				statusText: response.statusText,
+			});
 		} catch (err) {
 			if (!["document", "iframe"].includes(request.destination))
 				return new Response(undefined, { status: 500 });
@@ -112,13 +191,9 @@ export default class ScramjetServiceWorker {
 			return renderError(err, decodeUrl(request.url));
 		}
 	}
-}
+};
 
-
-function errorTemplate(
-    trace: string,
-    fetchedURL: string,
-) {
+function errorTemplate(trace: string, fetchedURL: string) {
 	// turn script into a data URI so we don"t have to escape any HTML values
 	const script = `
         errorTrace.value = ${JSON.stringify(trace)};
@@ -128,10 +203,9 @@ function errorTemplate(
 				)};
         reload.addEventListener("click", () => location.reload());
         version.textContent = "0.0.1";
-    `
+    `;
 
-    return (
-        `<!DOCTYPE html>
+	return `<!DOCTYPE html>
         <html>
         <head>
         <meta charset="utf-8" />
@@ -168,8 +242,7 @@ function errorTemplate(
 				}"></script>
         </body>
         </html>
-        `
-    );
+        `;
 }
 
 /**
@@ -182,18 +255,11 @@ function renderError(err, fetchedURL) {
 		"content-type": "text/html",
 	};
 	if (crossOriginIsolated) {
-        headers["Cross-Origin-Embedd'er-Policy"] = "require-corp";
+		headers["Cross-Origin-Embedder-Policy"] = "require-corp";
 	}
 
-    return new Response(
-        errorTemplate(
-            String(err),
-            fetchedURL
-        ),
-        {
+	return new Response(errorTemplate(String(err), fetchedURL), {
 		status: 500,
-            headers: headers
-        }
-    );
+		headers: headers,
+	});
 }
-

static/index.html

@@ -1,29 +1,39 @@
-<!DOCTYPE html>
+<!doctype html>
 <html lang="en">
-<head>
-    <meta charset="UTF-8">
-    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+	<head>
+		<meta charset="UTF-8" />
+		<meta name="viewport" content="width=device-width, initial-scale=1.0" />
 		<title>Document</title>
-    <link rel="prefetch" href="/scram/scramjet.worker.js" type="module">
-    <link rel="prefetch" href="/scram/scramjet.shared.js" type="module">
-    <link href="https://fonts.googleapis.com/css2?family=IBM+Plex+Mono:ital,wght@0,100;0,200;0,300;0,400;0,500;0,600;0,700;1,100;1,200;1,300;1,400;1,500;1,600;1,700&amp;family=Inter+Tight:ital,wght@0,100..900;1,100..900&amp;family=Inter:wght@100..900&amp;display=swap&amp;" rel="stylesheet">
+		<link rel="prefetch" href="/scram/scramjet.worker.js" />
+		<link rel="prefetch" href="/scram/scramjet.shared.js" />
+		<link
+			href="https://fonts.googleapis.com/css2?family=IBM+Plex+Mono:ital,wght@0,100;0,200;0,300;0,400;0,500;0,600;0,700;1,100;1,200;1,300;1,400;1,500;1,600;1,700&amp;family=Inter+Tight:ital,wght@0,100..900;1,100..900&amp;family=Inter:wght@100..900&amp;display=swap&amp;"
+			rel="stylesheet"
+		/>
 		<style>
-    body, html, #app {
-        font-family: "Inter", system-ui, -apple-system, BlinkMacSystemFont, sans-serif;
-        width:100vw;
-        height:100vh;
+			body,
+			html,
+			#app {
+				font-family:
+					"Inter",
+					system-ui,
+					-apple-system,
+					BlinkMacSystemFont,
+					sans-serif;
+				width: 100vw;
+				height: 100vh;
 				margin: 0;
 				padding: 0;
-        background-color:#121212;
+				background-color: #121212;
 				overflow: hidden;
 			}
 		</style>
-</head>
-<body>
+	</head>
+	<body>
 		<script src="https://unpkg.com/dreamland"></script>
 		<script src="/baremux/index.js" defer></script>
-    <script src="/scram/scramjet.codecs.js" type="module"></script>
-    <script src="/scram/scramjet.config.js" type="module"></script>
+		<script src="/scram/scramjet.codecs.js" defer></script>
+		<script src="/scram/scramjet.config.js" defer></script>
 		<script src="ui.js" defer></script>
-</body>
+	</body>
 </html>

static/sw.js

@@ -1,6 +1,9 @@
-import ScramjetServiceWorker from "/scram/scramjet.worker.js";
-import "/scram/scramjet.codecs.js";
-import "/scram/scramjet.config.js";
+importScripts(
+	"/scram/scramjet.codecs.js",
+	"/scram/scramjet.config.js",
+	"/scram/scramjet.shared.js",
+	"/scram/scramjet.worker.js"
+);
 
 const scramjet = new ScramjetServiceWorker();
 
@@ -9,7 +12,7 @@ async function handleRequest(event) {
 		return scramjet.fetch(event);
 	}
 
-    return fetch(event.request)
+	return fetch(event.request);
 }
 
 self.addEventListener("fetch", (event) => {

static/ui.js

@@ -1,16 +1,30 @@
-navigator.serviceWorker.register("./sw.js", {
-    scope: __scramjet$config.prefix,
-    type: "module"
-})
-const connection = new BareMux.BareMuxConnection("/baremux/worker.js")
-const flex = css`display: flex;`;
-const col = css`flex-direction: column;`;
-const store = $store({
+navigator.serviceWorker
+	.register("./sw.js", {
+		scope: $scramjet.config.prefix,
+	})
+	.then((reg) => {
+		reg.update();
+	});
+const connection = new BareMux.BareMuxConnection("/baremux/worker.js");
+const flex = css`
+	display: flex;
+`;
+const col = css`
+	flex-direction: column;
+`;
+const store = $store(
+	{
 		url: "https://google.com",
 		wispurl: "wss://wisp.mercurywork.shop/",
-    bareurl: (location.protocol === "https:" ? "https" : "http") + "://" + location.host + "/bare/",
-}, { ident: "settings", backing: "localstorage", autosave: "auto" });
-connection.setTransport("/baremod/index.mjs", [store.bareurl])
+		bareurl:
+			(location.protocol === "https:" ? "https" : "http") +
+			"://" +
+			location.host +
+			"/bare/",
+	},
+	{ ident: "settings", backing: "localstorage", autosave: "auto" }
+);
+connection.setTransport("/baremod/index.mjs", [store.bareurl]);
 function App() {
 	this.urlencoded = "";
 	this.css = `
@@ -89,12 +103,12 @@ function App() {
           <button on:click=${() => window.open(this.urlencoded)}>open in fullscreen</button>
         </div>
       </div>
-      <input class="bar" bind:value=${use(store.url)} on:input=${(e) => (store.url = e.target.value)} on:keyup=${(e) => e.keyCode == 13 && console.log(this.urlencoded = __scramjet$config.prefix + __scramjet$config.codec.encode(e.target.value))}></input>
+      <input class="bar" bind:value=${use(store.url)} on:input=${(e) => (store.url = e.target.value)} on:keyup=${(e) => e.keyCode == 13 && console.log((this.urlencoded = $scramjet.config.prefix + $scramjet.config.codec.encode(e.target.value)))}></input>
       <iframe src=${use(this.urlencoded)}></iframe>
     </div>
-    `
+    `;
 }
 
 window.addEventListener("load", () => {
-    document.body.appendChild(h(App))
-})
+	document.body.appendChild(h(App));
+});

tests/location.html

@@ -0,0 +1,7 @@
+<head></head>
+<script>
+	function f() {
+		location = "http://www.google.com";
+	}
+</script>
+<button onclick="f()">Google</button>

tsconfig.json

@@ -4,7 +4,7 @@
 		"rootDir": "./src",
 		"target": "ES2022",
 		"moduleResolution": "Bundler",
-    "module": "ES2022",
+		"module": "ES2022"
 	},
-  "include": ["src"],
+	"include": ["src"]
 }