fix: proxy Node.getRootNode

MercuryWorkshop · Oct 14, 2024 · ee85b48 · ee85b48
1 parent a2af4d7
commit ee85b48
Show file tree

Hide file tree

Showing 7 changed files with 13 additions and 4 deletions.
diff --git a/rewriter/build.sh b/rewriter/build.sh
@@ -36,7 +36,7 @@ mkdir dist/ || true
 {
 
 cat <<EOF
-if ("document" in self && document.currentScript) {
+if ("document" in self && document?.currentScript) {
 	document.currentScript.remove();
 }
 EOF

diff --git a/src/client/dom/element.ts b/src/client/dom/element.ts
@@ -306,6 +306,7 @@ export default function (client: ScramjetClient, self: typeof window) {
 			"Node.prototype.parentElement",
 			"Node.prototype.previousSibling",
 			"Node.prototype.nextSibling",
+			"Node.prototype.getRootNode",
 		],
 		{
 			get(ctx) {

diff --git a/src/client/index.ts b/src/client/index.ts
@@ -38,6 +38,6 @@ if (!(SCRAMJETCLIENT in <Partial<typeof self>>self)) {
 	client.frame?.dispatchEvent(ev);
 }
 
-if ("document" in self && document.currentScript) {
+if ("document" in self && document?.currentScript) {
 	document.currentScript.remove();
 }
diff --git a/src/client/shared/wrap.ts b/src/client/shared/wrap.ts
@@ -63,6 +63,11 @@ export default function (client: ScramjetClient, self: typeof globalThis) {
 		if (typeof v === "string" && v.includes("scramjet")) {
 			debugger;
 		}
+
+		if (typeof v === "string" && v.includes(location.origin)) {
+			debugger;
+		}
+
 		if (iswindow && v instanceof Document && v.defaultView.$scramjet) {
 			debugger;
 		}

diff --git a/src/shared/index.ts b/src/shared/index.ts
@@ -43,6 +43,6 @@ $scramjet.shared = {
 	CookieStore,
 };
 
-if ("document" in self && document.currentScript) {
+if ("document" in self && document?.currentScript) {
 	document.currentScript.remove();
 }
diff --git a/src/shared/rewriters/html.ts b/src/shared/rewriters/html.ts
@@ -45,7 +45,7 @@ export function rewriteHtml(
 		const injected = `
 			self.COOKIE = ${dump};
 			self.$scramjet.config = ${JSON.stringify($scramjet.config)};
-			if ("document" in self && document.currentScript) {
+			if ("document" in self && document?.currentScript) {
 				document.currentScript.remove();
 			}
 		`;

diff --git a/static/ui.js b/static/ui.js
@@ -10,6 +10,9 @@ const scramjet = new ScramjetController({
 		"https://discord.com/.*": {
 			naiiveRewriter: true,
 		},
+		"https://worker-playground.glitch.me/.*": {
+			serviceworkers: true,
+		},
 	},
 });