smal lharness fixes

Author: velzie

packages/scramjet/packages/runway/src/harness/scramjet/public/index.html

@@ -87,9 +87,17 @@ <h1>Scramjet Test Harness</h1>
 					sessionStorage.setItem("__runway_last_test", url);
 					reloadBtn.style.display = "inline-block";
 					// injectTestFunctions();
+					console.log("navigating to", url);
 					scramjetFrame.go(url);
 				};
 
+				window.__runwayGetProxiedUrl = (url) => {
+					return $scramjet.rewriteUrl(url, scramjetFrame.context, {
+						origin: new URL(location.href),
+						base: new URL(location.href),
+					});
+				};
+
 				window.__runwayReload = () => {
 					const lastTest = sessionStorage.getItem("__runway_last_test");
 					if (lastTest) {

packages/scramjet/packages/runway/src/index.ts

@@ -243,7 +243,11 @@ async function createTestPage(
 		} catch {
 			data = { message: payload, label: "default", value: payload };
 		}
-		if (expectedRunwayToken && data.__runwayToken !== expectedRunwayToken) {
+		if (
+			expectedRunwayToken &&
+			"__runwayToken" in data &&
+			data.__runwayToken !== expectedRunwayToken
+		) {
 			return;
 		}
 
@@ -590,6 +594,7 @@ async function main() {
 		1,
 		Number(process.env.RUNWAY_PARALLEL ?? parallelArg ?? 1)
 	);
+	const fastMode = process.env.RUNWAY_FAST === "1";
 
 	if (testFilter) {
 		console.log(`� Filter: "${testFilter}"`);
@@ -600,6 +605,9 @@ async function main() {
 	if (parallelism > 1) {
 		console.log(`🧵 Parallel workers: ${parallelism}\n`);
 	}
+	if (fastMode) {
+		console.log(`⚡ Fast mode: reusing one harness instance per worker\n`);
+	}
 
 	if (tests.length === 0) {
 		console.log(
@@ -696,7 +704,7 @@ async function main() {
 					})
 				: null,
 		});
-		let scramjetBindingsInstalled = true;
+		let scramjetBindingsInstalled = fastMode ? true : true;
 		let testPages = await createPages(scramjetBindingsInstalled);
 		let needsReload = true;
 
@@ -706,12 +714,12 @@ async function main() {
 
 			const consistencyTracker = createConsistencyTracker(!test.scramjetOnly);
 			consistencyHandler = consistencyTracker.handle;
-			if (test.reloadHarness) {
+			if (!fastMode && test.reloadHarness) {
 				needsReload = true;
 			}
 
 			// Reload pages if needed (first run or after failure)
-			const desiredScramjetBindings = !test.topLevelScramjet;
+			const desiredScramjetBindings = fastMode ? true : !test.topLevelScramjet;
 			if (
 				needsReload ||
 				desiredScramjetBindings !== scramjetBindingsInstalled
@@ -856,7 +864,7 @@ async function main() {
 				ghaError(
 					`Test "${test.name}" failed: ${finalResult.message || "Unknown error"}`
 				);
-				needsReload = true; // Reload after failure
+				needsReload = !fastMode; // Reload after failure unless fast mode is reusing harnesses
 			} else {
 				console.log(`💥 error (${duration}ms)`);
 				if (finalResult.message) {
@@ -865,7 +873,7 @@ async function main() {
 				ghaError(
 					`Test "${test.name}" error: ${finalResult.message || "Unknown error"}`
 				);
-				needsReload = true; // Reload after error
+				needsReload = !fastMode; // Reload after error unless fast mode is reusing harnesses
 			}
 			ghaEndGroup();
 		}

packages/scramjet/packages/runway/src/testcommon.ts

@@ -1,5 +1,5 @@
 import http from "http";
-import type { Socket } from "node:net";
+import type { AddressInfo, Socket } from "node:net";
 import type { FrameLocator, Page } from "playwright";
 
 export type TestContext = {
@@ -41,11 +41,10 @@ export function basicTest(props: {
 	scramjetOnly?: boolean;
 	expectedOkCount?: number;
 }): Test {
-	const port = nextPort++;
+	let port = 0;
 	let server: http.Server;
 	const scramjetOnly = props.scramjetOnly ?? /checkglobal\s*\(/i.test(props.js);
-
-	return {
+	const test: Test = {
 		name: props.name,
 		port,
 		scramjetOnly,
@@ -76,7 +75,11 @@ export function basicTest(props: {
 						res.end("Not found");
 					}
 				});
-				server.listen(port, () => resolve());
+				server.listen(0, () => {
+					port = (server.address() as AddressInfo).port;
+					test.port = port;
+					resolve();
+				});
 			});
 		},
 		async stop() {
@@ -97,6 +100,7 @@ export function basicTest(props: {
 			]);
 		},
 	};
+	return test;
 }
 
 /**
@@ -152,14 +156,13 @@ export function serverTest(props: {
 	scramjetOnly?: boolean;
 	expectedOkCount?: number;
 }) {
-	const port = nextPort++;
+	let port = 0;
 	let server: http.Server;
 	const activeSockets = new Set<Socket>();
 	const scramjetOnly =
 		props.scramjetOnly ??
 		(props.js ? /checkglobal\s*\(/i.test(props.js) : false);
-
-	return {
+	const test: Test = {
 		name: props.name,
 		port,
 		scramjetOnly,
@@ -207,9 +210,13 @@ export function serverTest(props: {
 					activeSockets.delete(socket);
 				});
 			});
-			await props.start(server, port, { pass, fail });
 			return new Promise<void>((resolve) => {
-				server.listen(port, () => resolve());
+				server.listen(0, async () => {
+					port = (server.address() as AddressInfo).port;
+					test.port = port;
+					await props.start(server, port, { pass, fail });
+					resolve();
+				});
 			});
 		},
 		async stop() {
@@ -235,6 +242,7 @@ export function serverTest(props: {
 			]);
 		},
 	};
+	return test;
 }
 
 type Frame = {