[scramjet/core] kill loadAndHook entry point

Author: velzie

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

@@ -1,5 +1,5 @@
 type ScramjetFrame = any;
-import { BareClient } from "@mercuryworkshop/bare-mux-custom";
+import { BareClient, BareTransport } from "@mercuryworkshop/bare-mux-custom";
 import { SCRAMJETCLIENT, SCRAMJETFRAME } from "@/symbols";
 import { getOwnPropertyDescriptorHandler } from "@client/helpers";
 import { createLocationProxy } from "@client/location";
@@ -8,10 +8,18 @@ import { NavigateEvent } from "@client/events";
 import { rewriteUrl, unrewriteUrl, type URLMeta } from "@rewriters/url";
 import { flagEnabled, ScramjetContext, ScramjetInterface } from "@/shared";
 import { CookieJar } from "@/shared/cookie";
-import { iswindow, ScramjetClientInit } from "./entry";
+import { iswindow } from "./entry";
 import { SingletonBox } from "./singletonbox";
 import { ScramjetConfig } from "@/types";
 
+export type ScramjetClientInit = {
+	context: ScramjetContext;
+	transport: BareTransport;
+	sendSetCookie: (url: URL, cookie: string) => Promise<void>;
+	shouldPassthroughWebsocket?: (url: string | URL) => boolean;
+	shouldBlockMessageEvent?: (ev: MessageEvent) => boolean;
+};
+
 type NativeStore = {
 	store: Record<string, any>;
 	call: (target: string, that: any, ...args) => any;

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

@@ -12,40 +12,3 @@ export const isworker = "WorkerGlobalScope" in globalThis;
 export const issw = "ServiceWorkerGlobalScope" in globalThis;
 export const isdedicated = "DedicatedWorkerGlobalScope" in globalThis;
 export const isshared = "SharedWorkerGlobalScope" in globalThis;
-
-function createFrameId() {
-	return `${Array(8)
-		.fill(0)
-		.map(() => Math.floor(Math.random() * 36).toString(36))
-		.join("")}`;
-}
-
-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) {
-	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)) {
-		const client = new ScramjetClient(globalThis, init);
-
-		const frame: HTMLIFrameElement =
-			globalThis.frameElement as HTMLIFrameElement;
-		if (frame && !frame.name) {
-			// all frames need to be named for our logic to work
-			frame.name = createFrameId();
-		}
-
-		client.hook();
-
-		const contextev = new ScramjetContextEvent(client.global.window, client);
-		client.frame?.dispatchEvent(contextev);
-		const urlchangeev = new UrlChangeEvent(client.url.href);
-		if (!client.isSubframe) client.frame?.dispatchEvent(urlchangeev);
-	}
-}