@php-wasm/node 0.5.5 → 0.6.0

package/index.d.ts

@@ -48,17 +48,29 @@ declare class PHPResponse implements PHPResponseData {
 	get text(): string;
 }
 /**
- * Represents an event related to the PHP filesystem.
+ * Represents an event related to the PHP request.
  */
 export interface PHPRequestEndEvent {
 	type: "request.end";
 }
+/**
+ * Represents a PHP runtime initialization event.
+ */
+export interface PHPRuntimeInitializedEvent {
+	type: "runtime.initialized";
+}
+/**
+ * Represents a PHP runtime destruction event.
+ */
+export interface PHPRuntimeBeforeDestroyEvent {
+	type: "runtime.beforedestroy";
+}
 /**
  * Represents an event related to the PHP instance.
  * This is intentionally not an extension of CustomEvent
  * to make it isomorphic between different JavaScript runtimes.
  */
-export type PHPEvent = PHPRequestEndEvent;
+export type PHPEvent = PHPRequestEndEvent | PHPRuntimeInitializedEvent | PHPRuntimeBeforeDestroyEvent;
 /**
  * A callback function that handles PHP events.
  */
@@ -194,6 +206,11 @@ export interface RequestHandler {
 	documentRoot: string;
 }
 export interface IsomorphicLocalPHP extends RequestHandler {
+	/**
+	 * Sets the SAPI name exposed by the PHP module.
+	 * @param newName - The new SAPI name.
+	 */
+	setSapiName(newName: string): void;
 	/**
 	 * Defines a constant in the PHP runtime.
 	 * @param key - The name of the constant.
@@ -431,7 +448,7 @@ export interface IsomorphicLocalPHP extends RequestHandler {
 	 *
 	 * @param handler Callback function to spawn a process.
 	 */
-	setSpawnHandler(handler: SpawnHandler): void;
+	setSpawnHandler(handler: SpawnHandler | string): void;
 }
 export type MessageListener = (data: string) => Promise<string | Uint8Array | void> | string | void;
 export interface EventEmitter {
@@ -442,7 +459,7 @@ export type ChildProcess = EventEmitter & {
 	stdout: EventEmitter;
 	stderr: EventEmitter;
 };
-export type SpawnHandler = (command: string) => ChildProcess;
+export type SpawnHandler = (command: string, args: string[]) => ChildProcess;
 export type HTTPMethod = "GET" | "POST" | "HEAD" | "OPTIONS" | "PATCH" | "PUT" | "DELETE";
 export type PHPRequestHeaders = Record<string, string>;
 export interface PHPRequest {
@@ -505,6 +522,11 @@ export interface PHPRunOptions {
 	 * The code snippet to eval instead of a php file.
 	 */
 	code?: string;
+	/**
+	 * Whether to throw an error if the PHP process exits with a non-zero code
+	 * or outputs to stderr.
+	 */
+	throwOnError?: boolean;
 }
 export interface FileInfo {
 	key: string;
@@ -624,11 +646,6 @@ export type PHPLoaderModule = {
 	dependenciesTotalSize: number;
 	init: (jsRuntime: string, options: EmscriptenOptions) => PHPRuntime;
 };
-export type DataModule = {
-	dependencyFilename: string;
-	dependenciesTotalSize: number;
-	default: (phpRuntime: PHPRuntime) => void;
-};
 export type EmscriptenOptions = {
 	onAbort?: (message: string) => void;
 	/**
@@ -638,7 +655,6 @@ export type EmscriptenOptions = {
 	ENV?: Record<string, string>;
 	locateFile?: (path: string) => string;
 	noInitialRun?: boolean;
-	dataFileDownloads?: Record<string, number>;
 	print?: (message: string) => void;
 	printErr?: (message: string) => void;
 	quit?: (status: number, toThrow: any) => void;
@@ -647,11 +663,28 @@ export type EmscriptenOptions = {
 	onMessage?: (listener: EmscriptenMessageListener) => void;
 } & Record<string, any>;
 export type EmscriptenMessageListener = (type: string, data: string) => void;
+export interface SemaphoreOptions {
+	concurrency: number;
+}
+declare class Semaphore {
+	private _running;
+	private concurrency;
+	private queue;
+	constructor({ concurrency }: SemaphoreOptions);
+	get running(): number;
+	acquire(): Promise<() => void>;
+	run<T>(fn: () => T | Promise<T>): Promise<T>;
+}
 declare const __private__dont__use: unique symbol;
 declare abstract class BasePHP implements IsomorphicLocalPHP {
 	#private;
 	protected [__private__dont__use]: any;
 	requestHandler?: PHPBrowser;
+	/**
+	 * An exclusive lock that prevent multiple requests from running at
+	 * the same time.
+	 */
+	semaphore: Semaphore;
 	/**
 	 * Initializes a PHP runtime.
 	 *
@@ -666,7 +699,7 @@ declare abstract class BasePHP implements IsomorphicLocalPHP {
 	/** @inheritDoc */
 	onMessage(listener: MessageListener): Promise<void>;
 	/** @inheritDoc */
-	setSpawnHandler(handler: SpawnHandler): Promise<void>;
+	setSpawnHandler(handler: SpawnHandler | string): Promise<void>;
 	/** @inheritDoc */
 	get absoluteUrl(): string;
 	/** @inheritDoc */
@@ -677,6 +710,8 @@ declare abstract class BasePHP implements IsomorphicLocalPHP {
 	internalUrlToPath(internalUrl: string): string;
 	initializeRuntime(runtimeId: PHPRuntimeId): void;
 	/** @inheritDoc */
+	setSapiName(newName: string): Promise<void>;
+	/** @inheritDoc */
 	setPhpIniPath(path: string): void;
 	/** @inheritDoc */
 	setPhpIniEntry(key: string, value: string): void;
@@ -687,7 +722,7 @@ declare abstract class BasePHP implements IsomorphicLocalPHP {
 	/** @inheritDoc */
 	run(request: PHPRunOptions): Promise<PHPResponse>;
 	addServerGlobalEntry(key: string, value: string): void;
-	defineConstant(key: string, value: string | number | null): void;
+	defineConstant(key: string, value: string | boolean | number | null): void;
 	/** @inheritDoc */
 	mkdir(path: string): void;
 	/** @inheritDoc */
@@ -710,14 +745,20 @@ declare abstract class BasePHP implements IsomorphicLocalPHP {
 	isDir(path: string): boolean;
 	/** @inheritDoc */
 	fileExists(path: string): boolean;
-	exit(code?: number): any;
+	/**
+	 * Hot-swaps the PHP runtime for a new one without
+	 * interrupting the operations of this PHP instance.
+	 *
+	 * @param runtime
+	 */
+	hotSwapPHPRuntime(runtime: number): void;
+	exit(code?: number): void;
 }
 export declare function getPHPLoaderModule(version?: SupportedPHPVersion): Promise<PHPLoaderModule>;
 export declare function withNetworking(phpModuleArgs?: EmscriptenOptions): Promise<EmscriptenOptions>;
 export interface PHPLoaderOptions {
 	emscriptenOptions?: EmscriptenOptions;
 	requestHandler?: PHPRequestHandlerConfiguration;
-	dataModules?: Array<DataModule | Promise<DataModule>>;
 }
 export type MountSettings = {
 	root: string;
@@ -743,10 +784,7 @@ export declare class NodePHP extends BasePHP {
 	 *
 	 * @see load
 	 */
-	static loadSync(phpVersion: SupportedPHPVersion, options?: PHPLoaderOptions): {
-		php: NodePHP;
-		phpReady: Promise<NodePHP>;
-	};
+	static loadRuntime(phpVersion: SupportedPHPVersion, options?: PHPLoaderOptions): Promise<number>;
 	/**
 	 * Enables host filesystem usage by mounting root
 	 * directories (e.g. /, /home, /var) into the in-memory

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@php-wasm/node",
-  "version": "0.5.5",
+  "version": "0.6.0",
   "description": "PHP.wasm for Node.js",
   "repository": {
     "type": "git",
@@ -28,7 +28,7 @@
   "license": "GPL-2.0-or-later",
   "main": "index.cjs",
   "types": "index.d.ts",
-  "gitHead": "1ec8131ad189a9d77ec1ecbfdf0f82abb6aeb96a",
+  "gitHead": "3f137306ec8e3b10ec0674a1fe69ee43349edb4a",
   "engines": {
     "node": ">=18.18.2",
     "npm": ">=8.11.0"
@@ -38,8 +38,8 @@
     "express": "4.18.2",
     "ws": "8.13.0",
     "yargs": "17.7.2",
-    "@php-wasm/node-polyfills": "0.5.5",
-    "@php-wasm/universal": "0.5.5",
-    "@php-wasm/util": "0.5.5"
+    "@php-wasm/node-polyfills": "0.6.0",
+    "@php-wasm/universal": "0.6.0",
+    "@php-wasm/util": "0.6.0"
   }
 }