[scramjet/core] final fixes

Author: velzie

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

@@ -108,8 +108,6 @@ export class ScramjetClient {
 	locationProxy: any;
 	serviceWorker: ServiceWorkerContainer;
 	bare: BareClient;
-	context: ScramjetContext;
-	rpc: ClientRPCDefs;
 
 	natives: NativeStore;
 	descriptors: DescriptorStore;
@@ -130,7 +128,11 @@ export class ScramjetClient {
 
 	box: SingletonBox;
 
-	constructor(public global: typeof globalThis) {
+	constructor(
+		public global: typeof globalThis,
+		public context: ScramjetContext,
+		public rpc: ClientRPCDefs
+	) {
 		if (SCRAMJETCLIENT in global) {
 			console.error(
 				"attempted to initialize a scramjet client, but one is already loaded - this is very bad"

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

@@ -527,7 +527,11 @@ export default function (client: ScramjetClient, self: typeof window) {
 				try {
 					if (!(SCRAMJETCLIENT in realwin)) {
 						// hook the iframe before the client can start to steal globals out of it
-						const newclient = new ScramjetClient(realwin);
+						const newclient = new ScramjetClient(
+							realwin,
+							client.context,
+							client.rpc
+						);
 						newclient.hook();
 					}
 				} catch {
@@ -556,7 +560,11 @@ export default function (client: ScramjetClient, self: typeof window) {
 				if (!realwin) return realwin;
 
 				if (!(SCRAMJETCLIENT in realwin)) {
-					const newclient = new ScramjetClient(realwin);
+					const newclient = new ScramjetClient(
+						realwin,
+						client.context,
+						client.rpc
+					);
 					newclient.hook();
 				}
 

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

@@ -19,7 +19,11 @@ export default function (client: ScramjetClient) {
 			if (SCRAMJETCLIENT in realwin) {
 				return ctx.return(realwin[SCRAMJETCLIENT].global);
 			} else {
-				const newclient = new ScramjetClient(realwin);
+				const newclient = new ScramjetClient(
+					realwin,
+					client.context,
+					client.rpc
+				);
 				// hook the opened window
 				newclient.hook();
 

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

@@ -40,9 +40,7 @@ export function loadAndHook(init: ScramjetClientEntryInit) {
 	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);
-		client.context = init.context;
-		client.rpc = init.rpc;
+		const client = new ScramjetClient(globalThis, init.context, init.rpc);
 
 		const frame: HTMLIFrameElement =
 			globalThis.frameElement as HTMLIFrameElement;

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

@@ -261,6 +261,9 @@ export function parseRequest(
 		strippedUrl.searchParams.delete(param);
 	}
 
+	if (!URL.canParse(unrewriteUrl(strippedUrl, handler.context))) {
+		throw new Error(`unable to parse rewritten url: ${strippedUrl.href}`);
+	}
 	const url = new URL(unrewriteUrl(strippedUrl, handler.context));
 
 	if (url.origin === new URL(request.rawUrl).origin) {