mercuryworkshop-mirror/scramjet
1
0
Fork 0
mirror of https://github.com/MercuryWorkshop/scramjet.git synced 2025-05-13 22:40:01 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

dumb regression

Browse source
This commit is contained in:
velzie 2024-08-26 12:28:09 -04:00
parent c38ba1c9b4
commit ac5b03736a
No known key found for this signature in database
GPG key ID: 048413F95F0DDE1F
3 changed files with 9 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/client/dom/element.ts
View file

@ -124,7 +124,7 @@ export default function (client: ScramjetClient, self: typeof window) {
const realwin = ctx.get() as Window; const realwin = ctx.get() as Window;
if (ScramjetClient.SCRAMJET in realwin.self) { if (ScramjetClient.SCRAMJET in realwin.self) {
return realwin.self[ScramjetClient.SCRAMJET].windowProxy; return realwin.self[ScramjetClient.SCRAMJET].globalProxy.window;
} else { } else {
// hook the iframe // hook the iframe
const newclient = new ScramjetClient(realwin.self); const newclient = new ScramjetClient(realwin.self);

6
src/client/dom/open.ts
View file

@ -14,7 +14,9 @@ export default function (client: ScramjetClient) {
if (!realwin) return ctx.return(realwin); if (!realwin) return ctx.return(realwin);
if (ScramjetClient.SCRAMJET in realwin.self) { if (ScramjetClient.SCRAMJET in realwin.self) {
return ctx.return(realwin.self[ScramjetClient.SCRAMJET].windowProxy); return ctx.return(
realwin.self[ScramjetClient.SCRAMJET].globalProxy.window
);
} else { } else {
const newclient = new ScramjetClient(realwin.self); const newclient = new ScramjetClient(realwin.self);
// hook the opened window // hook the opened window
@ -31,7 +33,7 @@ export default function (client: ScramjetClient) {
const realwin = ctx.get() as Window; const realwin = ctx.get() as Window;
if (realwin && ScramjetClient.SCRAMJET in realwin.self) { if (realwin && ScramjetClient.SCRAMJET in realwin.self) {
return realwin.self[ScramjetClient.SCRAMJET].windowProxy; return realwin.self[ScramjetClient.SCRAMJET].globalProxy;
} else { } else {
// the opener has to have been already hooked, so if we reach here then it's a real window // the opener has to have been already hooked, so if we reach here then it's a real window
return undefined; return undefined;

8
src/client/shared/wrap.ts
View file

@ -17,7 +17,7 @@ export default function (client: ScramjetClient, self: typeof globalThis) {
} else if (iswindow && identifier instanceof self.parent.self.Window) { } else if (iswindow && identifier instanceof self.parent.self.Window) {
if (ScramjetClient.SCRAMJET in self.parent.self) { if (ScramjetClient.SCRAMJET in self.parent.self) {
// ... then we're in a subframe, and the parent frame is also in a proxy context, so we should return its proxy // ... then we're in a subframe, and the parent frame is also in a proxy context, so we should return its proxy
return self.parent.self[ScramjetClient.SCRAMJET].windowProxy; return self.parent.self[ScramjetClient.SCRAMJET].globalProxy;
} else { } else {
// ... then we should pretend we aren't nested and return the current window // ... then we should pretend we aren't nested and return the current window
return client.globalProxy; return client.globalProxy;
@ -37,7 +37,7 @@ export default function (client: ScramjetClient, self: typeof globalThis) {
current = test; current = test;
} }
return current[ScramjetClient.SCRAMJET].windowProxy; return current[ScramjetClient.SCRAMJET].globalProxy.window;
} else if ( } else if (
(iswindow && identifier instanceof self.Location) || (iswindow && identifier instanceof self.Location) ||
(isworker && identifier instanceof self.WorkerLocation) (isworker && identifier instanceof self.WorkerLocation)
@ -89,7 +89,7 @@ export default function (client: ScramjetClient, self: typeof globalThis) {
} }
} }
self.$scramerr = function scramerr(e) { self.$scramerr = function scramerr(e) {
console.warn("CAUGHT ERROR", e); // console.warn("CAUGHT ERROR", e);
}; };
self.$scramdbg = function scramdbg(args, t) { self.$scramdbg = function scramdbg(args, t) {
@ -102,7 +102,7 @@ export default function (client: ScramjetClient, self: typeof globalThis) {
apply(ctx) { apply(ctx) {
ctx.args[0] = new Proxy(ctx.args[0], { ctx.args[0] = new Proxy(ctx.args[0], {
apply(target, thisArg, argArray) { apply(target, thisArg, argArray) {
console.warn("CAUGHT PROMISE REJECTION", argArray); // console.warn("CAUGHT PROMISE REJECTION", argArray);
Reflect.apply(target, thisArg, argArray); Reflect.apply(target, thisArg, argArray);
}, },
}); });