Draft php command

Author: adamziel

packages/playground/cli/src/blueprints-v1/worker-thread-v1.ts

@@ -3,18 +3,18 @@ import { loadNodeRuntime } from '@php-wasm/node';
 import { EmscriptenDownloadMonitor } from '@php-wasm/progress';
 import type { RemoteAPI, SupportedPHPVersion } from '@php-wasm/universal';
 import {
-	PHPWorker,
 	consumeAPI,
 	consumeAPISync,
 	exposeAPI,
 	sandboxedSpawnHandlerFactory,
 } from '@php-wasm/universal';
 import { sprintf } from '@php-wasm/util';
 import { RecommendedPHPVersion } from '@wp-playground/common';
-import { bootWordPress, bootRequestHandler } from '@wp-playground/wordpress';
+import { bootRequestHandler, bootWordPress } from '@wp-playground/wordpress';
 import { rootCertificates } from 'tls';
 import { jspi } from 'wasm-feature-detect';
-import { MessageChannel, type MessagePort, parentPort } from 'worker_threads';
+import { MessageChannel, parentPort, type MessagePort } from 'worker_threads';
+import { PlaygroundCliWorker } from '../playground-cli-worker';
 import { mountResources } from '../mounts';
 
 export interface Mount {
@@ -78,7 +78,7 @@ function tracePhpWasm(processId: number, format: string, ...args: any[]) {
 	);
 }
 
-export class PlaygroundCliBlueprintV1Worker extends PHPWorker {
+export class PlaygroundCliBlueprintV1Worker extends PlaygroundCliWorker {
 	booted = false;
 	fileLockManager: RemoteAPI<FileLockManager> | FileLockManager | undefined;
 
@@ -293,11 +293,6 @@ export class PlaygroundCliBlueprintV1Worker extends PHPWorker {
 			throw e;
 		}
 	}
-
-	// Provide a named disposal method that can be invoked via comlink.
-	async dispose() {
-		await this[Symbol.asyncDispose]();
-	}
 }
 
 const phpChannel = new MessageChannel();

packages/playground/cli/src/blueprints-v2/worker-thread-v2.ts

@@ -3,41 +3,39 @@ import type { FileLockManager } from '@php-wasm/node';
 import { createNodeFsMountHandler, loadNodeRuntime } from '@php-wasm/node';
 import { EmscriptenDownloadMonitor } from '@php-wasm/progress';
 import type {
-	PHP,
 	FileTree,
+	PHP,
 	RemoteAPI,
 	SupportedPHPVersion,
 } from '@php-wasm/universal';
 import {
 	PHPExecutionFailureError,
 	PHPResponse,
-	PHPWorker,
 	consumeAPI,
 	consumeAPISync,
 	exposeAPI,
 	sandboxedSpawnHandlerFactory,
 } from '@php-wasm/universal';
 import { sprintf } from '@php-wasm/util';
 import {
-	type BlueprintMessage,
 	runBlueprintV2,
-} from '@wp-playground/blueprints';
-import {
-	type ParsedBlueprintV2Declaration,
+	type BlueprintMessage,
 	type BlueprintV2Declaration,
+	type ParsedBlueprintV2Declaration,
 } from '@wp-playground/blueprints';
+import type {
+	PHPInstanceCreatedHook,
+	PhpIniOptions,
+} from '@wp-playground/wordpress';
 import { bootRequestHandler } from '@wp-playground/wordpress';
 import { existsSync } from 'fs';
 import path from 'path';
 import { rootCertificates } from 'tls';
-import { MessageChannel, type MessagePort, parentPort } from 'worker_threads';
-import type { Mount } from '../mounts';
 import { jspi } from 'wasm-feature-detect';
+import { MessageChannel, parentPort, type MessagePort } from 'worker_threads';
+import { PlaygroundCliWorker } from '../playground-cli-worker';
+import type { Mount } from '../mounts';
 import { type RunCLIArgs } from '../run-cli';
-import type {
-	PhpIniOptions,
-	PHPInstanceCreatedHook,
-} from '@wp-playground/wordpress';
 
 async function mountResources(php: PHP, mounts: Mount[]) {
 	for (const mount of mounts) {
@@ -154,7 +152,7 @@ export type WorkerBootRequestHandlerOptions = Omit<
 	onPHPInstanceCreated: PHPInstanceCreatedHook;
 };
 
-export class PlaygroundCliBlueprintV2Worker extends PHPWorker {
+export class PlaygroundCliBlueprintV2Worker extends PlaygroundCliWorker {
 	booted = false;
 	blueprintTargetResolved = false;
 	phpInstancesThatNeedMountsAfterTargetResolved = new Set<PHP>();
@@ -470,11 +468,6 @@ export class PlaygroundCliBlueprintV2Worker extends PHPWorker {
 			throw e;
 		}
 	}
-
-	// Provide a named disposal method that can be invoked via comlink.
-	async dispose() {
-		await this[Symbol.asyncDispose]();
-	}
 }
 
 const phpChannel = new MessageChannel();

packages/playground/cli/src/load-balancer.ts

@@ -1,8 +1,5 @@
 import type { PHPRequest, PHPResponse, RemoteAPI } from '@php-wasm/universal';
-import type { PlaygroundCliBlueprintV1Worker as PlaygroundCliWorkerV1 } from './blueprints-v1/worker-thread-v1';
-import type { PlaygroundCliBlueprintV2Worker as PlaygroundCliWorkerV2 } from './blueprints-v2/worker-thread-v2';
-
-type PlaygroundCliWorker = PlaygroundCliWorkerV1 | PlaygroundCliWorkerV2;
+import type { PlaygroundCliWorker } from './playground-cli-worker';
 
 // TODO: Let's merge worker management into PHPProcessManager
 // when we can have multiple workers in both CLI and web.

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

@@ -0,0 +1,30 @@
+import { PHPWorker } from '@php-wasm/universal';
+
+export class PlaygroundCliWorker extends PHPWorker {
+	async runCLIScript(
+		argv: string[],
+		options: { env?: Record<string, string> } = {}
+	) {
+		const streamedResponse = await this.cli(argv, options);
+		streamedResponse.stdout.pipeTo(
+			new WritableStream({
+				write(chunk) {
+					process.stdout.write(chunk);
+				},
+			})
+		);
+		streamedResponse.stderr.pipeTo(
+			new WritableStream({
+				write(chunk) {
+					process.stderr.write(chunk);
+				},
+			})
+		);
+		return await streamedResponse.exitCode;
+	}
+
+	// Provide a named disposal method that can be invoked via comlink.
+	async dispose() {
+		await this[Symbol.asyncDispose]();
+	}
+}

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

@@ -26,11 +26,7 @@ import {
 	parseMountWithDelimiterArguments,
 } from './mounts';
 import { startServer } from './start-server';
-import type {
-	Mount,
-	PlaygroundCliBlueprintV1Worker,
-} from './blueprints-v1/worker-thread-v1';
-import type { PlaygroundCliBlueprintV2Worker } from './blueprints-v2/worker-thread-v2';
+import type { Mount } from './blueprints-v1/worker-thread-v1';
 import { FileLockManagerForNode } from '@php-wasm/node';
 import { LoadBalancer } from './load-balancer';
 /* eslint-disable no-console */
@@ -49,6 +45,7 @@ import {
 	cleanupStalePlaygroundTempDirs,
 	createPlaygroundCliTempDir,
 } from './temp-dir';
+import type { PlaygroundCliWorker } from './playground-cli-worker';
 
 // Inlined worker URLs for static analysis by downstream bundlers
 // These are replaced at build time by the Vite plugin in vite.config.ts
@@ -75,9 +72,18 @@ export async function parseOptionsAndRunCLI() {
 			.usage('Usage: wp-playground <command> [options]')
 			.positional('command', {
 				describe: 'Command to run',
-				choices: ['server', 'run-blueprint', 'build-snapshot'] as const,
+				choices: [
+					'server',
+					'run-blueprint',
+					'build-snapshot',
+					'run-script',
+				] as const,
 				demandOption: true,
 			})
+			.option('script', {
+				describe: 'PHP script to run',
+				type: 'string',
+			})
 			.option('outfile', {
 				describe: 'When building, write to this output file.',
 				type: 'string',
@@ -354,7 +360,14 @@ export async function parseOptionsAndRunCLI() {
 
 		const command = args._[0] as string;
 
-		if (!['run-blueprint', 'server', 'build-snapshot'].includes(command)) {
+		if (
+			![
+				'run-blueprint',
+				'server',
+				'build-snapshot',
+				'run-script',
+			].includes(command)
+		) {
 			yargsObject.showHelp();
 			process.exit(1);
 		}
@@ -394,12 +407,13 @@ export async function parseOptionsAndRunCLI() {
 
 export interface RunCLIArgs {
 	blueprint?: BlueprintDeclaration | BlueprintBundle;
-	command: 'server' | 'run-blueprint' | 'build-snapshot';
+	command: 'server' | 'run-blueprint' | 'build-snapshot' | 'run-script';
 	debug?: boolean;
 	login?: boolean;
 	mount?: Mount[];
 	'mount-before-install'?: Mount[];
 	outfile?: string;
+	script?: string;
 	php?: SupportedPHPVersion;
 	port?: number;
 	'site-url'?: string;
@@ -436,10 +450,6 @@ export interface RunCLIArgs {
 	allow?: string;
 }
 
-type PlaygroundCliWorker =
-	| PlaygroundCliBlueprintV1Worker
-	| PlaygroundCliBlueprintV2Worker;
-
 export interface RunCLIServer extends AsyncDisposable {
 	playground: RemoteAPI<PlaygroundCliWorker>;
 	server: Server;
@@ -690,6 +700,18 @@ export async function runCLI(args: RunCLIArgs): Promise<RunCLIServer> {
 				} else if (args.command === 'run-blueprint') {
 					logger.log(`Blueprint executed`);
 					process.exit(0);
+				} else if (args.command === 'run-script') {
+					const exitCode = await playground.runCLIScript(
+						['php', args.script as string],
+						{
+							env: {
+								SHELL_PIPE: '0',
+							},
+						}
+					);
+					// Wait until the next tick before exiting to ensure the output is flushed.
+					await new Promise((resolve) => setTimeout(resolve, 0));
+					process.exit(exitCode);
 				}
 
 				if (
@@ -836,7 +858,6 @@ async function spawnWorkerThreads(
 						}
 					});
 					worker.once('error', function (e: Error) {
-						console.error(e);
 						const error = new Error(
 							`Worker failed to load worker. ${
 								e.message ? `Original error: ${e.message}` : ''