Compat with the new PHPProcessManager API

WordPress · Apr 22, 2024 · 6136e41 · 6136e41
1 parent 703634c
commit 6136e41
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 72 deletions.
diff --git a/packages/playground/cli/src/server.ts b/packages/playground/cli/src/server.ts
@@ -2,18 +2,10 @@ import express, { Request } from 'express';
 // import compression from 'compression';
 // import compressible from 'compressible';
 import { addTrailingSlash } from './middleware/add-trailing-slash';
-import {
-	MaxPhpInstancesError,
-	PHPBrowser,
-	PHPRequestHandler,
-	PHPResponse,
-	PhpProcessManager,
-	SpawnedPHP,
-} from '@php-wasm/universal';
+import { PHPRequestHandler } from '@php-wasm/universal';
 import { IncomingMessage, Server, ServerResponse } from 'http';
 import { AddressInfo } from 'net';
 import { createPhp } from './setup-php';
-import { NodePHP } from '@php-wasm/node';
 import { defineSiteUrl } from '@wp-playground/blueprints';
 
 export interface Mount {
@@ -56,19 +48,13 @@ export async function startServer(options: ServerOptions) {
 	console.log(`Server is running on ${absoluteUrl}`);
 	// open(absoluteUrl); // Open the URL in the default browser
 
-	const procManager = new PhpProcessManager<NodePHP>();
-	const requestHandler = new PHPBrowser(
-		new PHPRequestHandler({
-			documentRoot: '/wordpress',
-			absoluteUrl,
-		})
-	);
-	const phpFactory = () =>
-		createPhp(procManager, requestHandler, options.mounts || []);
-	procManager.setPhpFactory(phpFactory);
-
-	const primaryPhp = await phpFactory();
-	procManager.setPrimaryPhp(primaryPhp);
+	const requestHandler = new PHPRequestHandler({
+		phpFactory: async () => await createPhp(options.mounts || []),
+		documentRoot: '/wordpress',
+		absoluteUrl,
+	});
+	const primaryPhp = await requestHandler.getPrimaryPhp();
+	console.log({ primaryPhp });
 
 	await defineSiteUrl(primaryPhp, {
 		siteUrl: absoluteUrl,
@@ -77,37 +63,13 @@ export async function startServer(options: ServerOptions) {
 	console.log('PHP started', { absoluteUrl });
 
 	app.use('/', async (req, res) => {
-		console.log('Request received');
-		let spawnedPHP: SpawnedPHP<NodePHP> | undefined = undefined;
-		try {
-			spawnedPHP = await procManager.spawn();
-		} catch (e) {
-			if (e instanceof MaxPhpInstancesError) {
-				res.statusCode = 502;
-				res.end('Max PHP instances reached');
-			} else {
-				res.statusCode = 500;
-				res.end('Internal server error');
-			}
-			return;
-		}
-
-		console.log({
+		const phpResponse = await requestHandler.request({
 			url: req.url,
+			headers: parseHeaders(req),
+			method: req.method as any,
+			body: await bufferRequestBody(req),
 		});
 
-		let phpResponse: PHPResponse | undefined = undefined;
-		try {
-			phpResponse = await requestHandler.request(spawnedPHP!.php, {
-				url: req.url,
-				headers: parseHeaders(req),
-				method: req.method as any,
-				body: await bufferRequestBody(req),
-			});
-		} finally {
-			spawnedPHP!.reap();
-		}
-
 		res.statusCode = phpResponse.httpStatusCode;
 		for (const key in phpResponse.headers) {
 			res.setHeader(key, phpResponse.headers[key]);

diff --git a/packages/playground/cli/src/setup-php.ts b/packages/playground/cli/src/setup-php.ts
@@ -1,19 +1,10 @@
 import { NodePHP } from '@php-wasm/node';
-import {
-	type RequestHandler,
-	PhpProcessManager,
-	rotatePHPRuntime,
-} from '@php-wasm/universal';
+import { rotatePHPRuntime } from '@php-wasm/universal';
 import { Mount } from './server';
 import { rootCertificates } from 'tls';
 
-export async function createPhp(
-	processManager: PhpProcessManager<NodePHP>,
-	requestHandler: RequestHandler,
-	mounts: Mount[]
-) {
+export async function createPhp(mounts: Mount[]) {
 	const php = new NodePHP();
-	php.requestHandler = requestHandler as any;
 	php.initializeRuntime(await createPhpRuntime());
 	php.setPhpIniEntry('disable_functions', '');
 	php.setPhpIniEntry('allow_url_fopen', '1');
@@ -32,6 +23,7 @@ export async function createPhp(
 	// @see https://github.com/WordPress/wordpress-playground/pull/990 for more context
 	rotatePHPRuntime({
 		php,
+		cwd: '/wordpress',
 		recreateRuntime: createPhpRuntime,
 		maxRequests: 400,
 	});

diff --git a/packages/playground/node/src/index.ts b/packages/playground/node/src/index.ts
@@ -12,7 +12,7 @@ import {
 	runBlueprintSteps,
 } from '@wp-playground/blueprints';
 import { NodePHP } from '@php-wasm/node';
-import { UniversalPHP } from '@php-wasm/universal';
+import { PHPRequestHandler, UniversalPHP } from '@php-wasm/universal';
 import { collectPhpLogs, logger } from '@php-wasm/logger';
 
 export interface NodePlaygroundOptions {
@@ -37,23 +37,24 @@ export async function startPlaygroundNode(
 	 * @TODO use this workflow to compile WordPress for the web
 	 */
 	const compiled = compileBlueprint(options.blueprint || {});
-	const playground = await NodePHP.load(compiled.versions.php, {
-		requestHandler: {
-			documentRoot: options.wordpressPathOnHost,
-			absoluteUrl: options.serverUrl,
-		},
+
+	const handler = new PHPRequestHandler({
+		phpFactory: async () => await NodePHP.load(compiled.versions.php),
+		documentRoot: options.wordpressPathOnHost,
+		absoluteUrl: options.serverUrl,
 	});
+	const php = await handler.getPrimaryPhp();
 
-	collectPhpLogs(logger, playground);
+	collectPhpLogs(logger, php);
 
-	await defineSiteUrl(playground, {
+	await defineSiteUrl(php, {
 		siteUrl: options.serverUrl,
 	});
 
-	await allowWpOrgHosts(playground, options.wordpressPathOnHost);
+	await allowWpOrgHosts(php, options.wordpressPathOnHost);
 
-	await runBlueprintSteps(compiled, playground);
-	return playground;
+	await runBlueprintSteps(compiled, php);
+	return php;
 }
 
 export async function allowWpOrgHosts(