A boot() method to explicitly initialize the PHP worker

CHANGELOG.md

@@ -4,61 +4,58 @@ All notable changes to this project are documented in this file by a CI job
 that runs on every NPM release. The file follows the [Keep a Changelog](https://keepachangelog.com/en/1.1.0/)
 format.
 
-## [v0.9.30] (2024-08-19) 
+## [v0.9.30] (2024-08-19)
 
 ### Website
 
-- Ask users to report errors if Playground load fails. ([#1686](https://github.com/WordPress/wordpress-playground/pull/1686))
+-   Ask users to report errors if Playground load fails. ([#1686](https://github.com/WordPress/wordpress-playground/pull/1686))
 
 ### Bug Fixes
 
-- Avoid Blueprint schema formatting changes by build. ([#1685](https://github.com/WordPress/wordpress-playground/pull/1685))
+-   Avoid Blueprint schema formatting changes by build. ([#1685](https://github.com/WordPress/wordpress-playground/pull/1685))
 
 ### Various
 
-- [Website] Improves the messaging around exporting a zip if needed, when connecting to GitHub. ([#1689](https://github.com/WordPress/wordpress-playground/pull/1689))
+-   [Website] Improves the messaging around exporting a zip if needed, when connecting to GitHub. ([#1689](https://github.com/WordPress/wordpress-playground/pull/1689))
 
 ### Contributors
 
 The following contributors merged PRs in this release:
 
 @brandonpayton @jonathanbossenger
 
-
-## [v0.9.29] (2024-08-12) 
+## [v0.9.29] (2024-08-12)
 
 ### Tools
 
-- Add max-len rule. ([#1613](https://github.com/WordPress/wordpress-playground/pull/1613))
+-   Add max-len rule. ([#1613](https://github.com/WordPress/wordpress-playground/pull/1613))
 
 ### Experiments
 
-
 #### GitHub integration
 
-- Add site manager view and sidebar. ([#1661](https://github.com/WordPress/wordpress-playground/pull/1661))
-- Add sites from the site manager. ([#1680](https://github.com/WordPress/wordpress-playground/pull/1680))
+-   Add site manager view and sidebar. ([#1661](https://github.com/WordPress/wordpress-playground/pull/1661))
+-   Add sites from the site manager. ([#1680](https://github.com/WordPress/wordpress-playground/pull/1680))
 
 ### PHP WebAssembly
 
-- Offline mode end-to-end tests. ([#1648](https://github.com/WordPress/wordpress-playground/pull/1648))
+-   Offline mode end-to-end tests. ([#1648](https://github.com/WordPress/wordpress-playground/pull/1648))
 
 ### Website
 
-- Add nice redirects for the new documentation site. ([#1681](https://github.com/WordPress/wordpress-playground/pull/1681))
-- Fix site manager button styles. ([#1676](https://github.com/WordPress/wordpress-playground/pull/1676))
+-   Add nice redirects for the new documentation site. ([#1681](https://github.com/WordPress/wordpress-playground/pull/1681))
+-   Fix site manager button styles. ([#1676](https://github.com/WordPress/wordpress-playground/pull/1676))
 
 ### Bug Fixes
 
-- Revert "Offline mode end-to-end tests". ([#1673](https://github.com/WordPress/wordpress-playground/pull/1673))
+-   Revert "Offline mode end-to-end tests". ([#1673](https://github.com/WordPress/wordpress-playground/pull/1673))
 
 ### Contributors
 
 The following contributors merged PRs in this release:
 
 @adamziel @bgrgicak
 
-
 ## [v0.9.28] (2024-08-05)
 
 ### Blueprints

packages/docs/site/docs/main/changelog.md

@@ -9,61 +9,58 @@ All notable changes to this project are documented in this file by a CI job
 that runs on every NPM release. The file follows the [Keep a Changelog](https://keepachangelog.com/en/1.1.0/)
 format.
 
-## [v0.9.30] (2024-08-19) 
+## [v0.9.30] (2024-08-19)
 
 ### Website
 
-- Ask users to report errors if Playground load fails. ([#1686](https://github.com/WordPress/wordpress-playground/pull/1686))
+-   Ask users to report errors if Playground load fails. ([#1686](https://github.com/WordPress/wordpress-playground/pull/1686))
 
 ### Bug Fixes
 
-- Avoid Blueprint schema formatting changes by build. ([#1685](https://github.com/WordPress/wordpress-playground/pull/1685))
+-   Avoid Blueprint schema formatting changes by build. ([#1685](https://github.com/WordPress/wordpress-playground/pull/1685))
 
 ### Various
 
-- [Website] Improves the messaging around exporting a zip if needed, when connecting to GitHub. ([#1689](https://github.com/WordPress/wordpress-playground/pull/1689))
+-   [Website] Improves the messaging around exporting a zip if needed, when connecting to GitHub. ([#1689](https://github.com/WordPress/wordpress-playground/pull/1689))
 
 ### Contributors
 
 The following contributors merged PRs in this release:
 
 @brandonpayton @jonathanbossenger
 
-
-## [v0.9.29] (2024-08-12) 
+## [v0.9.29] (2024-08-12)
 
 ### Tools
 
-- Add max-len rule. ([#1613](https://github.com/WordPress/wordpress-playground/pull/1613))
+-   Add max-len rule. ([#1613](https://github.com/WordPress/wordpress-playground/pull/1613))
 
 ### Experiments
 
-
 #### GitHub integration
 
-- Add site manager view and sidebar. ([#1661](https://github.com/WordPress/wordpress-playground/pull/1661))
-- Add sites from the site manager. ([#1680](https://github.com/WordPress/wordpress-playground/pull/1680))
+-   Add site manager view and sidebar. ([#1661](https://github.com/WordPress/wordpress-playground/pull/1661))
+-   Add sites from the site manager. ([#1680](https://github.com/WordPress/wordpress-playground/pull/1680))
 
 ### PHP WebAssembly
 
-- Offline mode end-to-end tests. ([#1648](https://github.com/WordPress/wordpress-playground/pull/1648))
+-   Offline mode end-to-end tests. ([#1648](https://github.com/WordPress/wordpress-playground/pull/1648))
 
 ### Website
 
-- Add nice redirects for the new documentation site. ([#1681](https://github.com/WordPress/wordpress-playground/pull/1681))
-- Fix site manager button styles. ([#1676](https://github.com/WordPress/wordpress-playground/pull/1676))
+-   Add nice redirects for the new documentation site. ([#1681](https://github.com/WordPress/wordpress-playground/pull/1681))
+-   Fix site manager button styles. ([#1676](https://github.com/WordPress/wordpress-playground/pull/1676))
 
 ### Bug Fixes
 
-- Revert "Offline mode end-to-end tests". ([#1673](https://github.com/WordPress/wordpress-playground/pull/1673))
+-   Revert "Offline mode end-to-end tests". ([#1673](https://github.com/WordPress/wordpress-playground/pull/1673))
 
 ### Contributors
 
 The following contributors merged PRs in this release:
 
 @adamziel @bgrgicak
 
-
 ## [v0.9.28] (2024-08-05)
 
 ### Blueprints

packages/php-wasm/web/src/lib/directory-handle-mount.ts

@@ -29,6 +29,16 @@ declare global {
 	}
 }
 
+export type MountDevice =
+	| {
+			type: 'opfs';
+			path: string;
+	  }
+	| {
+			type: 'local-fs';
+			handle: FileSystemDirectoryHandle;
+	  };
+
 export interface MountOptions {
 	initialSync: {
 		direction?: 'opfs-to-memfs' | 'memfs-to-opfs';

packages/php-wasm/web/src/lib/index.ts

@@ -4,12 +4,16 @@ export type { LoaderOptions as PHPWebLoaderOptions } from './load-runtime';
 
 export { loadWebRuntime } from './load-runtime';
 export { getPHPLoaderModule } from './get-php-loader-module';
-export { registerServiceWorker, setPhpApi } from './register-service-worker';
+export {
+	registerServiceWorker,
+	setPhpInstanceUsedByServiceWorker,
+} from './register-service-worker';
 export { setupPostMessageRelay } from './setup-post-message-relay';
 
 export { spawnPHPWorkerThread } from './worker-thread/spawn-php-worker-thread';
 export { createDirectoryHandleMountHandler } from './directory-handle-mount';
 export type {
+	MountDevice,
 	MountOptions,
 	SyncProgress,
 	SyncProgressCallback,

packages/php-wasm/web/src/lib/register-service-worker.ts

@@ -23,7 +23,7 @@ export const phpApiPromise = new Promise<Client>((resolve) => {
  * @param {Client} api The PHP API client.
  *
  */
-export function setPhpApi(api: Client) {
+export function setPhpInstanceUsedByServiceWorker(api: Client) {
 	if (!api) {
 		throw new PhpWasmError('PHP API client must be a valid client object.');
 	}

packages/php-wasm/web/src/lib/worker-thread/spawn-php-worker-thread.ts

@@ -2,13 +2,9 @@
  * Spawns a new Worker Thread.
  *
  * @param  workerUrl The absolute URL of the worker script.
- * @param  config
  * @returns The spawned Worker Thread.
  */
-export async function spawnPHPWorkerThread(
-	workerUrl: string,
-	startupOptions: Record<string, string | string[]> = {}
-) {
+export async function spawnPHPWorkerThread(workerUrl: string) {
 	const worker = new Worker(workerUrl, { type: 'module' });
 	return new Promise<Worker>((resolve, reject) => {
 		worker.onerror = (e) => {
@@ -20,10 +16,6 @@ export async function spawnPHPWorkerThread(
 			(error as any).filename = e.filename;
 			reject(error);
 		};
-		worker.postMessage({
-			type: 'startup-options',
-			startupOptions,
-		});
 		// There is no way to know when the worker script has started
 		// executing, so we use a message to signal that.
 		function onStartup(event: { data: string }) {

packages/playground/client/src/index.ts

@@ -22,7 +22,7 @@ export {
 	SupportedPHPVersionsList,
 	LatestSupportedPHPVersion,
 } from '@php-wasm/universal';
-export type { PlaygroundClient } from '@wp-playground/remote';
+export type { PlaygroundClient, MountDescriptor } from '@wp-playground/remote';
 
 export { phpVar, phpVars } from '@php-wasm/util';
 
@@ -34,8 +34,9 @@ import {
 } from '@wp-playground/blueprints';
 import { consumeAPI } from '@php-wasm/web';
 import { ProgressTracker } from '@php-wasm/progress';
-import { PlaygroundClient } from '@wp-playground/remote';
+import type { MountDescriptor, PlaygroundClient } from '@wp-playground/remote';
 import { collectPhpLogs, logger } from '@php-wasm/logger';
+
 export interface StartPlaygroundOptions {
 	iframe: HTMLIFrameElement;
 	remoteUrl: string;
@@ -57,7 +58,6 @@ export interface StartPlaygroundOptions {
 	 * @private
 	 */
 	sapiName?: string;
-
 	/**
 	 * Called before the blueprint steps are run,
 	 * allows the caller to delay the Blueprint execution
@@ -67,6 +67,8 @@ export interface StartPlaygroundOptions {
 	 */
 	onBeforeBlueprint?: () => Promise<void>;
 	siteSlug?: string;
+	mounts?: Array<MountDescriptor>;
+	shouldInstallWordPress?: boolean;
 }
 
 /**
@@ -86,7 +88,8 @@ export async function startPlaygroundWeb({
 	onClientConnected = () => {},
 	sapiName,
 	onBeforeBlueprint,
-	siteSlug,
+	mounts,
+	shouldInstallWordPress,
 }: StartPlaygroundOptions): Promise<PlaygroundClient> {
 	assertValidRemote(remoteUrl);
 	allowStorageAccessByUserActivation(iframe);
@@ -95,28 +98,46 @@ export async function startPlaygroundWeb({
 		progressbar: !disableProgressBar,
 	});
 	progressTracker.setCaption('Preparing WordPress');
+
 	// Set a default blueprint if none is provided.
 	if (!blueprint) {
 		blueprint = {
 			phpExtensionBundles: ['kitchen-sink'],
 		};
 	}
+
 	const compiled = compileBlueprint(blueprint, {
 		progress: progressTracker.stage(0.5),
 		onStepCompleted: onBlueprintStepCompleted,
 	});
-	const playground = await doStartPlaygroundWeb(
-		iframe,
-		setQueryParams(remoteUrl, {
-			php: compiled.versions.php,
-			wp: compiled.versions.wp,
-			['sapi-name']: sapiName,
-			['php-extension']: compiled.phpExtensions,
-			['networking']: compiled.features.networking ? 'yes' : 'no',
-			'site-slug': siteSlug,
-		}),
-		progressTracker
-	);
+
+	await new Promise((resolve) => {
+		iframe.src = remoteUrl;
+		iframe.addEventListener('load', resolve, false);
+	});
+
+	// Connect the Comlink API client to the remote worker,
+	// boot the playground, and run the blueprint steps.
+	const playground = consumeAPI<PlaygroundClient>(
+		iframe.contentWindow!,
+		iframe.ownerDocument!.defaultView!
+	) as PlaygroundClient;
+	await playground.isConnected();
+	progressTracker.pipe(playground);
+	const downloadPHPandWP = progressTracker.stage();
+	await playground.onDownloadProgress(downloadPHPandWP.loadingListener);
+	await playground.boot({
+		mounts,
+		sapiName,
+		shouldInstallWordPress,
+		phpVersion: compiled.versions.php,
+		wpVersion: compiled.versions.wp,
+		phpExtensions: compiled.phpExtensions,
+		withNetworking: compiled.features.networking,
+	});
+	await playground.isReady();
+	downloadPHPandWP.finish();
+
 	collectPhpLogs(logger, playground);
 	onClientConnected(playground);
 
@@ -151,39 +172,6 @@ function allowStorageAccessByUserActivation(iframe: HTMLIFrameElement) {
 	}
 }
 
-/**
- * Internal function to connect an iframe to the playground remote.
- *
- * @param iframe
- * @param remoteUrl
- * @param progressTracker
- * @returns
- */
-async function doStartPlaygroundWeb(
-	iframe: HTMLIFrameElement,
-	remoteUrl: string,
-	progressTracker: ProgressTracker
-) {
-	await new Promise((resolve) => {
-		iframe.src = remoteUrl;
-		iframe.addEventListener('load', resolve, false);
-	});
-
-	// Connect the Comlink client and wait until the
-	// playground is ready.
-	const playground = consumeAPI<PlaygroundClient>(
-		iframe.contentWindow!,
-		iframe.ownerDocument!.defaultView!
-	) as PlaygroundClient;
-	await playground.isConnected();
-	progressTracker.pipe(playground);
-	const downloadPHPandWP = progressTracker.stage();
-	await playground.onDownloadProgress(downloadPHPandWP.loadingListener);
-	await playground.isReady();
-	downloadPHPandWP.finish();
-	return playground;
-}
-
 const officialRemoteOrigin = 'https://playground.wordpress.net';
 function assertValidRemote(remoteHtmlUrl: string) {
 	const url = new URL(remoteHtmlUrl, officialRemoteOrigin);
@@ -215,33 +203,3 @@ function setQueryParams(url: string, params: Record<string, unknown>) {
 	urlObject.search = qs.toString();
 	return urlObject.toString();
 }
-
-/**
- * @deprecated Use `startPlayground` instead.
- *
- * @param iframe Any iframe with Playground's remote.html loaded.
- * @param options Optional. If `loadRemote` is set, the iframe's `src` will be set to that URL.
- *                In other words, use this option if your iframe doesn't have
- *                remote.html already
- * 				  loaded.
- */
-export async function connectPlayground(
-	iframe: HTMLIFrameElement,
-	options?: { loadRemote?: string }
-): Promise<PlaygroundClient> {
-	logger.warn(
-		'`connectPlayground` is deprecated and will be removed. Use `startPlayground` instead.'
-	);
-	if (options?.loadRemote) {
-		return startPlaygroundWeb({
-			iframe,
-			remoteUrl: options.loadRemote,
-		});
-	}
-	const client = consumeAPI<PlaygroundClient>(
-		iframe.contentWindow!,
-		iframe.ownerDocument!.defaultView!
-	) as PlaygroundClient;
-	await client.isConnected();
-	return client;
-}