@wp-playground/cli 3.0.54 → 3.1.0

package/blueprints-v1/blueprints-v1-handler.d.ts

@@ -1,7 +1,8 @@
 /// <reference types="node" />
+import { type Pooled } from '@php-wasm/universal';
 import type { PlaygroundCliBlueprintV1Worker } from './worker-thread-v1';
 import type { MessagePort as NodeMessagePort } from 'worker_threads';
-import { type RunCLIArgs, type SpawnedWorker, type WorkerType } from '../run-cli';
+import { type PlaygroundCliWorker, type RunCLIArgs, type SpawnedWorker, type WorkerType } from '../run-cli';
 import type { CLIOutput } from '../cli-output';
 /**
  * Boots Playground CLI workers using Blueprint version 1.
@@ -11,20 +12,17 @@ import type { CLIOutput } from '../cli-output';
  */
 export declare class BlueprintsV1Handler {
     private siteUrl;
-    private processIdSpaceLength;
     private args;
     private cliOutput;
     constructor(args: RunCLIArgs, options: {
         siteUrl: string;
-        processIdSpaceLength: number;
         cliOutput: CLIOutput;
     });
     getWorkerType(): WorkerType;
-    bootAndSetUpInitialPlayground(phpPort: NodeMessagePort, fileLockManagerPort: NodeMessagePort, nativeInternalDirPath: string): Promise<import("@php-wasm/universal").RemoteAPI<PlaygroundCliBlueprintV1Worker>>;
-    bootPlayground({ worker, fileLockManagerPort, firstProcessId, nativeInternalDirPath, }: {
+    bootWordPress(playground: Pooled<PlaygroundCliWorker>, workerPostInstallMountsPort: NodeMessagePort): Promise<Pooled<PlaygroundCliWorker>>;
+    bootRequestHandler({ worker, fileLockManagerPort, nativeInternalDirPath, }: {
         worker: SpawnedWorker;
         fileLockManagerPort: NodeMessagePort;
-        firstProcessId: number;
         nativeInternalDirPath: string;
     }): Promise<import("@php-wasm/universal").RemoteAPI<PlaygroundCliBlueprintV1Worker>>;
     compileInputBlueprint(additionalBlueprintSteps: any[]): Promise<import("@wp-playground/blueprints").CompiledBlueprintV1>;

package/blueprints-v1/worker-thread-v1.d.ts

@@ -1,61 +1,32 @@
 /// <reference types="node" />
-import type { FileLockManager } from '@php-wasm/node';
+import type { FileLockManager } from '@php-wasm/universal';
 import { EmscriptenDownloadMonitor } from '@php-wasm/progress';
-import type { PathAlias, RemoteAPI, SupportedPHPVersion } from '@php-wasm/universal';
+import type { PathAlias, SupportedPHPVersion } from '@php-wasm/universal';
 import { PHPWorker } from '@php-wasm/universal';
 import { type WordPressInstallMode } from '@wp-playground/wordpress';
 import { type MessagePort } from 'worker_threads';
 import type { Mount } from '@php-wasm/cli-util';
-export type WorkerBootOptions = {
-    phpVersion: SupportedPHPVersion;
+export type WorkerBootWordPressOptions = {
     siteUrl: string;
-    mountsBeforeWpInstall: Array<Mount>;
-    mountsAfterWpInstall: Array<Mount>;
-    firstProcessId: number;
-    processIdSpaceLength: number;
-    followSymlinks: boolean;
-    trace: boolean;
-    /**
-     * When true, Playground will not send cookies to the client but will manage
-     * them internally. This can be useful in environments that can't store cookies,
-     * e.g. VS Code WebView.
-     *
-     * Default: false.
-     */
-    internalCookieStore?: boolean;
-    withIntl?: boolean;
-    withRedis?: boolean;
-    withMemcached?: boolean;
-    withXdebug?: boolean;
-    nativeInternalDirPath: string;
-    /**
-     * PHP constants to define via php.defineConstant().
-     * Process-specific, set for each PHP instance.
-     */
-    constants?: Record<string, string | number | boolean | null>;
-    /**
-     * Path aliases that map URL prefixes to filesystem paths outside
-     * the document root. Similar to Nginx's `alias` directive.
-     */
-    pathAliases?: PathAlias[];
-};
-export type PrimaryWorkerBootOptions = WorkerBootOptions & {
-    wordpressInstallMode: WordPressInstallMode;
     wpVersion?: string;
+    wordpressInstallMode: WordPressInstallMode;
     wordPressZip?: ArrayBuffer;
     sqliteIntegrationPluginZip?: ArrayBuffer;
     dataSqlPath?: string;
+    /**
+     * PHP constants to define via php.defineConstant().
+     */
+    constants?: Record<string, string | number | boolean>;
 };
 interface WorkerBootRequestHandlerOptions {
     siteUrl: string;
-    followSymlinks: boolean;
     phpVersion: SupportedPHPVersion;
-    firstProcessId: number;
-    processIdSpaceLength: number;
+    processId: number;
     trace: boolean;
     nativeInternalDirPath: string;
     mountsBeforeWpInstall: Array<Mount>;
     mountsAfterWpInstall: Array<Mount>;
+    followSymlinks: boolean;
     withIntl?: boolean;
     withRedis?: boolean;
     withMemcached?: boolean;
@@ -63,8 +34,9 @@ interface WorkerBootRequestHandlerOptions {
     pathAliases?: PathAlias[];
 }
 export declare class PlaygroundCliBlueprintV1Worker extends PHPWorker {
-    booted: boolean;
-    fileLockManager: RemoteAPI<FileLockManager> | FileLockManager | undefined;
+    bootedRequestHandler: boolean;
+    bootedWordPress: boolean;
+    fileLockManager: FileLockManager | undefined;
     constructor(monitor: EmscriptenDownloadMonitor);
     /**
      * Call this method before boot() to use file locking.
@@ -76,10 +48,9 @@ export declare class PlaygroundCliBlueprintV1Worker extends PHPWorker {
      * @see phpwasm-emscripten-library-file-locking-for-node.js
      */
     useFileLockManager(port: MessagePort): Promise<void>;
-    bootAndSetUpInitialWorker(options: PrimaryWorkerBootOptions): Promise<void>;
-    hello(): Promise<string>;
-    bootWorker(args: WorkerBootOptions): Promise<void>;
+    bootWordPress(options: WorkerBootWordPressOptions, workerPostInstallMountsPort: MessagePort): Promise<void>;
     bootRequestHandler(options: WorkerBootRequestHandlerOptions): Promise<void>;
+    mountAfterWordPressInstall(mounts: Array<Mount>): Promise<void>;
     dispose(): Promise<void>;
 }
 export {};

package/blueprints-v2/blueprints-v2-handler.d.ts

@@ -1,8 +1,9 @@
 /// <reference types="node" />
-import type { RemoteAPI } from '@php-wasm/universal';
+import type { Pooled } from '@php-wasm/universal';
+import { type RemoteAPI } from '@php-wasm/universal';
 import type { PlaygroundCliBlueprintV2Worker } from './worker-thread-v2';
 import type { MessagePort as NodeMessagePort } from 'worker_threads';
-import { type RunCLIArgs, type SpawnedWorker, type WorkerType } from '../run-cli';
+import { type PlaygroundCliWorker, type RunCLIArgs, type SpawnedWorker, type WorkerType } from '../run-cli';
 import type { CLIOutput } from '../cli-output';
 /**
  * Boots Playground CLI workers using Blueprint version 2.
@@ -13,20 +14,17 @@ import type { CLIOutput } from '../cli-output';
 export declare class BlueprintsV2Handler {
     private phpVersion;
     private siteUrl;
-    private processIdSpaceLength;
     private args;
     private cliOutput;
     constructor(args: RunCLIArgs, options: {
         siteUrl: string;
-        processIdSpaceLength: number;
         cliOutput: CLIOutput;
     });
     getWorkerType(): WorkerType;
-    bootAndSetUpInitialPlayground(phpPort: NodeMessagePort, fileLockManagerPort: NodeMessagePort, nativeInternalDirPath: string): Promise<RemoteAPI<PlaygroundCliBlueprintV2Worker>>;
-    bootPlayground({ worker, fileLockManagerPort, firstProcessId, nativeInternalDirPath, }: {
+    bootWordPress(playground: Pooled<PlaygroundCliWorker>, workerPostInstallMountsPort: NodeMessagePort): Promise<Pooled<PlaygroundCliWorker>>;
+    bootRequestHandler({ worker, fileLockManagerPort, nativeInternalDirPath, }: {
         worker: SpawnedWorker;
         fileLockManagerPort: NodeMessagePort;
-        firstProcessId: number;
         nativeInternalDirPath: string;
     }): Promise<RemoteAPI<PlaygroundCliBlueprintV2Worker>>;
 }

package/blueprints-v2/worker-thread-v2.d.ts

@@ -1,7 +1,7 @@
 /// <reference types="node" />
-import type { FileLockManager } from '@php-wasm/node';
+import type { FileLockManager } from '@php-wasm/universal';
 import { EmscriptenDownloadMonitor } from '@php-wasm/progress';
-import type { PathAlias, PHP, FileTree, RemoteAPI, SupportedPHPVersion, SpawnHandler } from '@php-wasm/universal';
+import type { PathAlias, PHP, FileTree, SupportedPHPVersion, SpawnHandler } from '@php-wasm/universal';
 import { PHPWorker } from '@php-wasm/universal';
 import { type BlueprintV1Declaration } from '@wp-playground/blueprints';
 import { type ParsedBlueprintV2String, type RawBlueprintV2Data } from '@wp-playground/blueprints';
@@ -9,21 +9,9 @@ import { type MessagePort } from 'worker_threads';
 import { type RunCLIArgs } from '../run-cli';
 import type { PhpIniOptions, PHPInstanceCreatedHook } from '@wp-playground/wordpress';
 import type { Mount } from '@php-wasm/cli-util';
-export type PrimaryWorkerBootArgs = Omit<RunCLIArgs, 'mount-before-install' | 'mount'> & {
-    phpVersion: SupportedPHPVersion;
+export type WorkerWordPressBootArgs = Omit<RunCLIArgs, 'mount-before-install' | 'mount'> & {
     siteUrl: string;
-    firstProcessId: number;
-    processIdSpaceLength: number;
-    trace: boolean;
     blueprint: RawBlueprintV2Data | ParsedBlueprintV2String | BlueprintV1Declaration;
-    nativeInternalDirPath: string;
-    mountsBeforeWpInstall?: Array<Mount>;
-    mountsAfterWpInstall?: Array<Mount>;
-    /**
-     * PHP constants to define via php.defineConstant().
-     * Process-specific, set for each PHP instance.
-     */
-    constants?: Record<string, string | number | boolean | null>;
 };
 type WorkerRunBlueprintArgs = Omit<RunCLIArgs, 'mount-before-install' | 'mount'> & {
     siteUrl: string;
@@ -37,8 +25,7 @@ export type SecondaryWorkerBootArgs = {
     phpIniEntries?: PhpIniOptions;
     constants?: Record<string, string | number | boolean | null>;
     createFiles?: FileTree;
-    firstProcessId: number;
-    processIdSpaceLength: number;
+    processId: number;
     trace: boolean;
     nativeInternalDirPath: string;
     withIntl?: boolean;
@@ -57,7 +44,7 @@ export declare class PlaygroundCliBlueprintV2Worker extends PHPWorker {
     booted: boolean;
     blueprintTargetResolved: boolean;
     phpInstancesThatNeedMountsAfterTargetResolved: Set<PHP>;
-    fileLockManager: RemoteAPI<FileLockManager> | FileLockManager | undefined;
+    fileLockManager: FileLockManager | undefined;
     constructor(monitor: EmscriptenDownloadMonitor);
     /**
      * Call this method before boot() to use file locking.
@@ -69,10 +56,12 @@ export declare class PlaygroundCliBlueprintV2Worker extends PHPWorker {
      * @see phpwasm-emscripten-library-file-locking-for-node.js
      */
     useFileLockManager(port: MessagePort): Promise<void>;
-    bootAndSetUpInitialWorker(args: PrimaryWorkerBootArgs): Promise<void>;
+    bootWordPress(args: WorkerWordPressBootArgs, workerPostInstallMountsPort: MessagePort): Promise<void>;
     bootWorker(args: SecondaryWorkerBootArgs): Promise<void>;
-    runBlueprintV2(args: WorkerRunBlueprintArgs): Promise<void>;
-    bootRequestHandler({ siteUrl, allow, phpVersion, createFiles, constants, phpIniEntries, firstProcessId, processIdSpaceLength, trace, nativeInternalDirPath, withIntl, withRedis, withMemcached, withXdebug, pathAliases, onPHPInstanceCreated, spawnHandler, }: WorkerBootRequestHandlerOptions): Promise<void>;
+    runBlueprintV2(args: WorkerRunBlueprintArgs, workerPostInstallMountsPort: MessagePort): Promise<void>;
+    bootRequestHandler({ siteUrl, allow, phpVersion, processId, createFiles, constants, phpIniEntries, trace, nativeInternalDirPath, withIntl, withRedis, withMemcached, withXdebug, pathAliases, onPHPInstanceCreated, spawnHandler, }: WorkerBootRequestHandlerOptions): Promise<void>;
+    mountAfterWordPressInstall(mounts: Array<Mount>): Promise<void>;
+    applyPostInstallMountsToAllWorkers(postInstallMountsPort: MessagePort): Promise<void>;
     dispose(): Promise<void>;
 }
 export {};

package/cli.cjs

@@ -1,2 +1,2 @@
-"use strict";const s=require("./run-cli-DHqpmO6s.cjs"),r=process.argv.slice(2);s.parseOptionsAndRunCLI(r);
+"use strict";const s=require("./run-cli-CIkDrr7x.cjs"),r=process.argv.slice(2);s.parseOptionsAndRunCLI(r);
 //# sourceMappingURL=cli.cjs.map

package/cli.js

@@ -1,4 +1,4 @@
-import { p as s } from "./run-cli-Cxpf7CoX.js";
+import { p as s } from "./run-cli-BzYAH0YF.js";
 const r = process.argv.slice(2);
 s(r);
 //# sourceMappingURL=cli.js.map

package/index.cjs

@@ -1,2 +1,2 @@
-"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const e=require("./run-cli-DHqpmO6s.cjs");exports.LogVerbosity=e.LogVerbosity;exports.internalsKeyForTesting=e.internalsKeyForTesting;exports.mergeDefinedConstants=e.mergeDefinedConstants;exports.parseOptionsAndRunCLI=e.parseOptionsAndRunCLI;exports.runCLI=e.runCLI;exports.spawnWorkerThread=e.spawnWorkerThread;
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const e=require("./run-cli-CIkDrr7x.cjs");exports.LogVerbosity=e.LogVerbosity;exports.internalsKeyForTesting=e.internalsKeyForTesting;exports.mergeDefinedConstants=e.mergeDefinedConstants;exports.parseOptionsAndRunCLI=e.parseOptionsAndRunCLI;exports.runCLI=e.runCLI;exports.spawnWorkerThread=e.spawnWorkerThread;
 //# sourceMappingURL=index.cjs.map

package/index.js

@@ -1,4 +1,4 @@
-import { L as r, i as a, m as n, p as o, r as t, s as i } from "./run-cli-Cxpf7CoX.js";
+import { L as r, i as a, m as n, p as o, r as t, s as i } from "./run-cli-BzYAH0YF.js";
 export {
   r as LogVerbosity,
   a as internalsKeyForTesting,

package/load-balancer.d.ts

@@ -1,16 +1,23 @@
-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;
-type WorkerLoad = {
-    worker: RemoteAPI<PlaygroundCliWorker>;
-    activeRequests: Set<Promise<PHPResponse>>;
+import type { PHPRequest, PHPResponse } from '@php-wasm/universal';
+export interface LoadBalancerWorker {
+    request(request: PHPRequest): Promise<PHPResponse>;
+}
+type InProgressRequest = {
+    request: PHPRequest;
+    promisedResponse: Promise<PHPResponse>;
+};
+type QueuedRequest = {
+    request: PHPRequest;
+    resolve: (response: PHPResponse | PromiseLike<PHPResponse>) => void;
+    reject: (reason?: any) => void;
 };
 export declare class LoadBalancer {
-    workerLoads: WorkerLoad[];
-    constructor(initialWorker: RemoteAPI<PlaygroundCliWorker>);
-    addWorker(worker: RemoteAPI<PlaygroundCliWorker>): void;
-    removeWorker(worker: RemoteAPI<PlaygroundCliWorker>): Promise<void>;
+    workers: LoadBalancerWorker[];
+    freeWorkers: LoadBalancerWorker[];
+    busyWorkers: Map<LoadBalancerWorker, InProgressRequest>;
+    queuedRequests: QueuedRequest[];
+    constructor(workers: LoadBalancerWorker[]);
     handleRequest(request: PHPRequest): Promise<PHPResponse>;
+    private dispatchQueuedRequests;
 }
 export {};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@wp-playground/cli",
-  "version": "3.0.54",
+  "version": "3.1.0",
   "description": "WordPress Playground CLI",
   "repository": {
     "type": "git",
@@ -34,7 +34,7 @@
   "bin": {
     "wp-playground-cli": "wp-playground.js"
   },
-  "gitHead": "e449793042bf2c66f8fdd4212ef266801ae3f605",
+  "gitHead": "be66d7e27ea9a8f09c2cc15e4470a6e28def5c58",
   "dependencies": {
     "@zip.js/zip.js": "2.7.57",
     "ajv": "8.12.0",
@@ -44,6 +44,7 @@
     "diff3": "0.0.4",
     "express": "4.22.0",
     "fast-xml-parser": "^5.3.4",
+    "fs-ext-extra-prebuilt": "2.2.7",
     "fs-extra": "11.1.1",
     "ignore": "5.3.2",
     "ini": "4.1.2",
@@ -54,7 +55,6 @@
     "pify": "2.3.0",
     "ps-man": "1.1.8",
     "readable-stream": "3.6.2",
-    "selfsigned": "5.5.0",
     "sha.js": "2.4.12",
     "simple-get": "4.0.1",
     "tmp-promise": "3.0.3",
@@ -62,18 +62,18 @@
     "ws": "8.18.3",
     "xml2js": "0.6.2",
     "yargs": "17.7.2",
-    "@php-wasm/logger": "3.0.54",
-    "@php-wasm/progress": "3.0.54",
-    "@php-wasm/universal": "3.0.54",
-    "@wp-playground/blueprints": "3.0.54",
-    "@wp-playground/common": "3.0.54",
-    "@wp-playground/wordpress": "3.0.54",
-    "@php-wasm/node": "3.0.54",
-    "@php-wasm/util": "3.0.54",
-    "@php-wasm/cli-util": "3.0.54",
-    "@wp-playground/storage": "3.0.54",
-    "@php-wasm/xdebug-bridge": "3.0.54",
-    "@wp-playground/tools": "3.0.54"
+    "@php-wasm/logger": "3.1.0",
+    "@php-wasm/progress": "3.1.0",
+    "@php-wasm/universal": "3.1.0",
+    "@wp-playground/blueprints": "3.1.0",
+    "@wp-playground/common": "3.1.0",
+    "@wp-playground/wordpress": "3.1.0",
+    "@php-wasm/node": "3.1.0",
+    "@php-wasm/util": "3.1.0",
+    "@php-wasm/cli-util": "3.1.0",
+    "@wp-playground/storage": "3.1.0",
+    "@php-wasm/xdebug-bridge": "3.1.0",
+    "@wp-playground/tools": "3.1.0"
   },
   "packageManager": "npm@10.9.2",
   "overrides": {
@@ -87,8 +87,5 @@
     "form-data": "^4.0.4",
     "lodash": "^4.17.23",
     "glob": "^9.3.0"
-  },
-  "optionalDependencies": {
-    "fs-ext": "2.1.1"
   }
 }

package/process-id-allocator.d.ts

@@ -0,0 +1,9 @@
+export declare class ProcessIdAllocator {
+    private initialId;
+    private maxId;
+    private nextId;
+    private claimed;
+    constructor(initialId?: number, maxId?: number);
+    claim(): number;
+    release(id: number): boolean;
+}