[scramjet/core] remove allowedwebsocketurls from config, add shouldPassthroughWebsocket and shouldBlockMessage functions to init

Author: velzie

packages/scramjet/packages/core/src/client/client.ts

@@ -123,8 +123,6 @@ export class ScramjetClient {
 
 	context: ScramjetContext;
 
-	sendSetCookie: (url: URL, cookie: string) => Promise<void>;
-
 	constructor(
 		public global: typeof globalThis,
 		public init: ScramjetClientInit
@@ -151,7 +149,6 @@ export class ScramjetClient {
 
 		this.context = init.context;
 		this.bare = new BareClient(init.transport);
-		this.sendSetCookie = init.sendSetCookie;
 
 		this.serviceWorker = this.global.navigator.serviceWorker;
 

packages/scramjet/packages/core/src/client/dom/cookie.ts

@@ -7,7 +7,7 @@ export default function (client: ScramjetClient, self: typeof window) {
 		},
 		set(ctx, value: string) {
 			client.context.cookieJar.setCookies([value], client.url);
-			client.sendSetCookie(client.url, value);
+			client.init.sendSetCookie(client.url, value);
 		},
 	});
 

packages/scramjet/packages/core/src/client/entry.ts

@@ -1,6 +1,6 @@
 // entrypoint for scramjet.client.js
 
-import { ScramjetContext, ScramjetInterface, setConfig } from "@/shared/index";
+import { ScramjetContext, ScramjetInterface } from "@/shared/index";
 import { SCRAMJETCLIENT } from "@/symbols";
 import { ScramjetClient } from "@client/index";
 import { ScramjetContextEvent, UrlChangeEvent } from "@client/events";
@@ -24,11 +24,11 @@ export type ScramjetClientInit = {
 	context: ScramjetContext;
 	transport: BareTransport;
 	sendSetCookie: (url: URL, cookie: string) => Promise<void>;
+	shouldPassthroughWebsocket?: (url: string | URL) => boolean;
+	shouldBlockMessageEvent?: (ev: MessageEvent) => boolean;
 };
 
 export function loadAndHook(init: ScramjetClientInit) {
-	setConfig(init.context.config);
-
 	dbg.log("initializing scramjet client");
 	// if it already exists, that means the handlers have probably already been setup by the parent document
 	if (!(SCRAMJETCLIENT in <Partial<typeof self>>globalThis)) {

packages/scramjet/packages/core/src/client/shared/event.ts

@@ -10,8 +10,7 @@ export default function (client: ScramjetClient, self: Self) {
 	const handlers = {
 		message: {
 			_init() {
-				if (typeof this.data === "object" && "$scramjet$type" in this.data) {
-					// this is a ctl message
+				if (client.init.shouldBlockMessageEvent(this)) {
 					return false;
 				}
 
@@ -77,6 +76,7 @@ export default function (client: ScramjetClient, self: Self) {
 						const handler = handlers[type];
 
 						if (handler._init) {
+							// if _init returns false, we skip the event, and it never dispatches to listeners
 							if (handler._init.call(realEvent) === false) return;
 						}
 

packages/scramjet/packages/core/src/client/shared/requests/websocket.ts

@@ -30,9 +30,7 @@ export default function (client: ScramjetClient, self: typeof globalThis) {
 		new WeakMap();
 	client.Proxy("WebSocket", {
 		construct(ctx) {
-			if (
-				client.config.allowedwebsockets.some((w) => ctx.args[0].startsWith(w))
-			) {
+			if (client.init.shouldPassthroughWebsocket(ctx.args[0])) {
 				return ctx.return(client.natives.construct("WebSocket", ...ctx.args));
 			}
 			const fakeWebSocket = new EventTarget() as WebSocket;

packages/scramjet/packages/core/src/index.ts

@@ -42,7 +42,6 @@ export const defaultConfig: ScramjetConfig = {
 	},
 	siteFlags: {},
 	maskedfiles: [],
-	allowedwebsockets: [],
 };
 
 // bundled build will have the wasm binary inlined as a base64 string

packages/scramjet/packages/core/src/types.ts

@@ -48,7 +48,6 @@ export interface ScramjetConfig {
 		tempunusedid: string;
 	};
 	maskedfiles: string[];
-	allowedwebsockets: string[];
 	flags: ScramjetFlags;
 	siteFlags: Record<string, Partial<ScramjetFlags>>;
 }