[core] NUKE GLOBALPROXY

Author: velzie

src/client/document.ts

@@ -410,15 +410,13 @@ export default function (client: ScramjetClient, self: typeof window) {
 				const realwin = ctx.get() as Window;
 				if (!realwin) return realwin;
 
-				if (SCRAMJETCLIENT in realwin) {
-					return realwin[SCRAMJETCLIENT].globalProxy;
-				} else {
-					// hook the iframe
+				if (!(SCRAMJETCLIENT in realwin)) {
+					// hook the iframe before the client can start to steal globals out of it
 					const newclient = new ScramjetClient(realwin);
 					newclient.hook();
-
-					return newclient.globalProxy;
 				}
+
+				return realwin;
 			},
 		}
 	);
@@ -438,14 +436,12 @@ export default function (client: ScramjetClient, self: typeof window) {
 				);
 				if (!realwin) return realwin;
 
-				if (SCRAMJETCLIENT in realwin) {
-					return realwin[SCRAMJETCLIENT].documentProxy;
-				} else {
+				if (!(SCRAMJETCLIENT in realwin)) {
 					const newclient = new ScramjetClient(realwin);
 					newclient.hook();
-
-					return newclient.documentProxy;
 				}
+
+				return realwin.document;
 			},
 		}
 	);
@@ -467,76 +463,6 @@ export default function (client: ScramjetClient, self: typeof window) {
 		}
 	);
 
-	client.Trap("TreeWalker.prototype.currentNode", {
-		get(ctx) {
-			return ctx.get();
-		},
-		set(ctx, value) {
-			if (value === client.documentProxy) {
-				return ctx.set(self.document);
-			}
-
-			return ctx.set(value);
-		},
-	});
-
-	client.Proxy("Document.prototype.open", {
-		apply(ctx) {
-			const doc = ctx.call() as Document;
-
-			const scram: ScramjetClient = doc[SCRAMJETCLIENT];
-			if (!scram) return ctx.return(doc); // ??
-
-			return ctx.return(scram.documentProxy);
-		},
-	});
-
-	client.Trap("Node.prototype.ownerDocument", {
-		get(ctx) {
-			const doc = ctx.get() as Document | null;
-			if (!doc) return null;
-
-			const scram: ScramjetClient = doc[SCRAMJETCLIENT];
-			if (!scram) return doc; // ??
-
-			return scram.documentProxy;
-		},
-	});
-
-	client.Trap(
-		[
-			"Node.prototype.parentNode",
-			"Node.prototype.parentElement",
-			"Node.prototype.previousSibling",
-			"Node.prototype.nextSibling",
-			"Range.prototype.commonAncestorContainer",
-			"AbstractRange.prototype.endContainer",
-			"AbstractRange.prototype.startContainer",
-		],
-		{
-			get(ctx) {
-				const n = ctx.get() as Node;
-				if (!(n instanceof Document)) return n;
-
-				const scram: ScramjetClient = n[SCRAMJETCLIENT];
-				if (!scram) return n; // ??
-
-				return scram.documentProxy;
-			},
-		}
-	);
-	client.Proxy("Node.prototype.getRootNode", {
-		apply(ctx) {
-			const n = ctx.call() as Node;
-			if (!(n instanceof Document)) return ctx.return(n);
-
-			const scram: ScramjetClient = n[SCRAMJETCLIENT];
-			if (!scram) return ctx.return(n); // ??
-
-			return ctx.return(scram.documentProxy);
-		},
-	});
-
 	client.Proxy("DOMParser.prototype.parseFromString", {
 		apply(ctx) {
 			if (ctx.args[1] === "text/html") {

src/client/dom/element.ts

@@ -13,31 +13,7 @@ export default function (client: ScramjetClient) {
 
 			const realwin = ctx.call();
 
-			if (!realwin) return ctx.return(realwin);
-
-			if (SCRAMJETCLIENT in realwin) {
-				return ctx.return(realwin[SCRAMJETCLIENT].globalProxy);
-			} else {
-				const newclient = new ScramjetClient(realwin);
-				// hook the opened window
-				newclient.hook();
-
-				return ctx.return(newclient.globalProxy);
-			}
-		},
-	});
-
-	// opener will refer to the real window if it was opened by window.open
-	client.Trap("opener", {
-		get(ctx) {
-			const realwin = ctx.get() as Window;
-
-			if (realwin && SCRAMJETCLIENT in realwin) {
-				return realwin[SCRAMJETCLIENT].globalProxy;
-			} else {
-				// the opener has to have been already hooked, so if we reach here then it's a real window
-				return undefined;
-			}
+			return ctx.return(realwin);
 		},
 	});
 

src/client/dom/open.ts

@@ -1,7 +1,5 @@
 import { ScramjetFrame } from "@/controller/frame";
 import { SCRAMJETCLIENT, SCRAMJETFRAME } from "@/symbols";
-import { createDocumentProxy } from "@client/document";
-import { createGlobalProxy } from "@client/global";
 import { getOwnPropertyDescriptorHandler } from "@client/helpers";
 import { createLocationProxy } from "@client/location";
 import { nativeGetOwnPropertyDescriptor } from "@client/natives";
@@ -68,8 +66,6 @@ export type Trap<T> = {
 };
 
 export class ScramjetClient {
-	documentProxy: any;
-	globalProxy: any;
 	locationProxy: any;
 	serviceWorker: ServiceWorkerContainer;
 	bare: BareClientType;
@@ -123,13 +119,10 @@ export class ScramjetClient {
 		this.serviceWorker = this.global.navigator.serviceWorker;
 
 		if (iswindow) {
-			this.documentProxy = createDocumentProxy(this, global);
-
 			global.document[SCRAMJETCLIENT] = this;
 		}
 
 		this.locationProxy = createLocationProxy(this, global);
-		this.globalProxy = createGlobalProxy(this, global);
 		this.wrapfn = createWrapFn(this, global);
 		this.sourcemaps = {};
 		this.natives = {

src/client/global.ts

@@ -4,7 +4,6 @@ import { SCRAMJETCLIENT } from "@/symbols";
 import { ScramjetClient } from "@client/index";
 import { getOwnPropertyDescriptorHandler } from "@client/helpers";
 import { nativeGetOwnPropertyDescriptor } from "@client/natives";
-import { unproxy } from "@client/shared/unproxy";
 
 const realOnEvent = Symbol.for("scramjet original onevent function");
 
@@ -26,9 +25,9 @@ export default function (client: ScramjetClient, self: Self) {
 			source() {
 				if (this.source === null) return null;
 
-				const scram: ScramjetClient = this.source[SCRAMJETCLIENT];
+				// const scram: ScramjetClient = this.source[SCRAMJETCLIENT];
 
-				if (scram) return scram.globalProxy;
+				// if (scram) return scram.globalProxy;
 
 				return this.source;
 			},
@@ -127,7 +126,6 @@ export default function (client: ScramjetClient, self: Self) {
 
 	client.Proxy("EventTarget.prototype.addEventListener", {
 		apply(ctx) {
-			unproxy(ctx, client);
 			if (typeof ctx.args[1] !== "function") return;
 
 			const origlistener = ctx.args[1];
@@ -148,7 +146,6 @@ export default function (client: ScramjetClient, self: Self) {
 
 	client.Proxy("EventTarget.prototype.removeEventListener", {
 		apply(ctx) {
-			unproxy(ctx, client);
 			if (typeof ctx.args[1] !== "function") return;
 
 			const arr = client.eventcallbacks.get(ctx.this);
@@ -166,12 +163,6 @@ export default function (client: ScramjetClient, self: Self) {
 		},
 	});
 
-	client.Proxy("EventTarget.prototype.dispatchEvent", {
-		apply(ctx) {
-			unproxy(ctx, client);
-		},
-	});
-
 	const targets = [self.self, self.MessagePort.prototype] as Array<any>;
 	if (iswindow) targets.push(self.HTMLElement.prototype);
 	if (self.Worker) targets.push(self.Worker.prototype);