Remove landing page redirect – it breaks login handling

Author: adamziel

packages/php-wasm/node/src/lib/networking/outbound-ws-to-tcp-proxy.ts

@@ -206,8 +206,10 @@ async function onWsConnect(client: any, request: http.IncomingMessage) {
 			clientLog("can't resolve " + reqTargetHost + ' due to:', e);
 			// Send empty binary data to notify requester that connection was
 			// initiated
-			client.send([]);
-			client.close(3000);
+			setTimeout(() => {
+				client.send([]);
+				client.close(3000);
+			});
 			return;
 		}
 	} else {
@@ -238,7 +240,12 @@ async function onWsConnect(client: any, request: http.IncomingMessage) {
 	});
 	target.on('error', function (e: any) {
 		clientLog('target connection error', e);
-		target.end();
-		client.close(3000);
+		setTimeout(() => {
+			client.send([]);
+			client.close(3000);
+			if (target) {
+				target.end();
+			}
+		});
 	});
 }

packages/playground/cli/src/run-cli.ts

@@ -488,7 +488,8 @@ export async function runCLI(args: RunCLIArgs): Promise<RunCLIServer> {
 	const fileLockManager = new FileLockManagerForNode(nativeFlockSync);
 
 	let wordPressReady = false;
-	let isFirstRequest = false; // Set to true after booting WordPress
+	let isFirstRequest = true;
+	let isSecondRequest = false;
 
 	logger.log('Starting a PHP server...');
 
@@ -625,7 +626,6 @@ export async function runCLI(args: RunCLIArgs): Promise<RunCLIServer> {
 
 				await playground.isReady();
 				wordPressReady = true;
-				isFirstRequest = true;
 				logger.log(`Booted!`);
 
 				if (compiledBlueprint) {
@@ -753,10 +753,11 @@ export async function runCLI(args: RunCLIArgs): Promise<RunCLIServer> {
 			// assume they don't have to auto-login again.
 			if (isFirstRequest) {
 				isFirstRequest = false;
+				isSecondRequest = true;
 				const headers: Record<string, string[]> = {
 					'Content-Type': ['text/plain'],
 					'Content-Length': ['0'],
-					Location: [compiledBlueprint.landingPage],
+					Location: ['/'],
 				};
 				if (
 					request.headers?.['cookie']?.includes(
@@ -767,14 +768,7 @@ export async function runCLI(args: RunCLIArgs): Promise<RunCLIServer> {
 						'playground_auto_login_already_happened=1; Max-Age=0; Expires=Thu, 01 Jan 1970 00:00:00 GMT; Path=/',
 					];
 				}
-				return new PHPResponse(
-					302,
-					{
-						'Content-Length': ['0'],
-						Location: [compiledBlueprint.landingPage],
-					},
-					new Uint8Array()
-				);
+				return new PHPResponse(302, headers, new Uint8Array());
 			}
 			return await loadBalancer.handleRequest(request);
 		},