mercuryworkshop-mirror/scramjet
1
0
Fork 0
mirror of https://github.com/MercuryWorkshop/scramjet.git synced 2025-05-16 07:30:02 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

chore: code cleanup

Browse source
This commit is contained in:
Percs 2024-12-13 22:54:13 -06:00
parent 8fe0d895f0
commit 530439bdfe
4 changed files with 9 additions and 62 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/client/dom/serviceworker.ts
View file

@ -25,7 +25,7 @@ export default function (client: ScramjetClient, _self: Self) {
> = new WeakMap();
client.Proxy("EventTarget.prototype.addEventListener", {
apply(ctx) {
if (registration === ctx.this) {
if (registrationmap.get(ctx.this)) {
// do nothing
ctx.return(undefined);
}
@ -34,7 +34,7 @@ export default function (client: ScramjetClient, _self: Self) {
client.Proxy("EventTarget.prototype.removeEventListener", {
apply(ctx) {
if (registration === ctx.this) {
if (registrationmap.get(ctx.this)) {
// do nothing
ctx.return(undefined);
}

62
src/client/shared/requests/websocket.ts
View file

@ -7,10 +7,7 @@ type FakeWebSocketState = {
url: string;
binaryType: string;
barews: BareWebSocket;
/*
captureListeners: Record<string, EventListener[]>;
listeners: Record<string, EventListener[]>;
*/
onclose?: (ev: CloseEvent) => any;
onerror?: (ev: Event) => any;
onmessage?: (ev: MessageEvent) => any;
@ -49,10 +46,7 @@ export default function (client: ScramjetClient, self: typeof globalThis) {
url: ctx.args[0],
binaryType: "blob",
barews,
/*
captureListeners: {},
listeners: {},
*/
onclose: null,
onerror: null,
onmessage: null,
@ -107,58 +101,6 @@ export default function (client: ScramjetClient, self: typeof globalThis) {
ctx.return(fakeWebSocket);
},
});
// i have no clue why this is here but it prevents the real event listener from ever happening so im commenting it out for now
/*
client.Proxy("EventTarget.prototype.addEventListener", {
apply(ctx) {
const ws = socketmap.get(ctx.this);
if (!ws) return; // it's not a websocket ignore it
const [type, listener, opts] = ctx.args;
if (
(typeof opts === "object" && opts.capture) ||
(typeof opts === "boolean" && opts)
) {
const listeners = (ws.captureListeners[type] ??= []);
listeners.push(listener);
ws.captureListeners[type] = listeners;
} else {
const listeners = (ws.listeners[type] ??= []);
listeners.push(listener);
ws.listeners[type] = listeners;
}
ctx.return(undefined);
},
});
client.Proxy("EventTarget.prototype.removeEventListener", {
apply(ctx) {
const ws = socketmap.get(ctx.this);
if (!ws) return;
const [type, listener, opts] = ctx.args;
if (
(typeof opts === "object" && opts.capture) ||
(typeof opts === "boolean" && opts)
) {
const listeners = (ws.captureListeners[type] ??= []);
const idx = listeners.indexOf(listener);
if (idx !== -1) listeners.splice(idx, 1);
ws.captureListeners[type] = listeners;
} else {
const listeners = (ws.listeners[type] ??= []);
const idx = listeners.indexOf(listener);
if (idx !== -1) listeners.splice(idx, 1);
ws.listeners[type] = listeners;
}
ctx.return(undefined);
},
});
*/
client.Trap("WebSocket.prototype.binaryType", {
get(ctx) {
const ws = socketmap.get(ctx.this);

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

@ -74,6 +74,10 @@ export default function (client: ScramjetClient, self: typeof globalThis) {
debugger;
}
if (v === self && v.$scramjet) {
debugger;
}
if (iswindow && v instanceof Document && v.defaultView.$scramjet) {
debugger;
}

1
static/playground.js
View file

@ -9,6 +9,7 @@ const scramjet = new ScramjetController({
flags: {
serviceworkers: true,
syncxhr: true,
scramitize: true,
},
});