@php-wasm/node 2.0.22 → 3.0.2

package/jspi/php_8_3.js

@@ -8,7 +8,7 @@ import path from 'path';
 
 const dependencyFilename = path.join(__dirname, '8_3_25', 'php_8_3.wasm');
 export { dependencyFilename };
-export const dependenciesTotalSize = 26008228;
+export const dependenciesTotalSize = 26008164;
 const phpVersionString = '8.3.25';
 export function init(RuntimeName, PHPLoader) {
 	// The rest of the code comes from the built php.js file and esm-suffix.js
@@ -848,7 +848,7 @@ export function init(RuntimeName, PHPLoader) {
 		},
 	};
 
-	var ___heap_base = 13877856;
+	var ___heap_base = 13877792;
 
 	var alignMemory = (size, alignment) => {
 		return Math.ceil(size / alignment) * alignment;
@@ -1743,13 +1743,13 @@ export function init(RuntimeName, PHPLoader) {
 		1024
 	);
 
-	var ___stack_high = 13877856;
+	var ___stack_high = 13877792;
 
-	var ___stack_low = 12829280;
+	var ___stack_low = 12829216;
 
 	var ___stack_pointer = new WebAssembly.Global(
 		{ value: 'i32', mutable: true },
-		13877856
+		13877792
 	);
 
 	var PATH = {
@@ -6578,7 +6578,7 @@ export function init(RuntimeName, PHPLoader) {
 		O_NONBLOCK: 2048,
 		POLLHUP: 16,
 		SETFL_MASK: 3072,
-		init: function () {
+		init: function (phpWasmInitOptions) {
 			Module['ENV'] = Module['ENV'] || {};
 			// Ensure a platform-level bin directory for a fallback `php` binary.
 			Module['ENV']['PATH'] = [
@@ -6588,28 +6588,48 @@ export function init(RuntimeName, PHPLoader) {
 				.filter(Boolean)
 				.join(':');
 
-			// The /internal directory is required by the C module. It's where the
+			// The /request directory is required by the C module. It's where the
 			// stdout, stderr, and headers information are written for the JavaScript
-			// code to read later on.
+			// code to read later on. This is per-request state that is isolated to a
+			// single PHP process.
+			FS.mkdir('/request');
+			// The /internal directory is shared amongst all PHP processes
+			// and contains wp-config.php, constants, etc.
 			FS.mkdir('/internal');
+
+			if (phpWasmInitOptions?.nativeInternalDirPath) {
+				FS.mount(
+					FS.filesystems.NODEFS,
+					{ root: phpWasmInitOptions.nativeInternalDirPath },
+					'/internal'
+				);
+			}
+
 			// The files from the shared directory are shared between all the
 			// PHP processes managed by PHPProcessManager.
-			FS.mkdir('/internal/shared');
+			FS.mkdirTree('/internal/shared');
+
 			// The files from the preload directory are preloaded using the
 			// auto_prepend_file php.ini directive.
-			FS.mkdir('/internal/shared/preload');
+			FS.mkdirTree('/internal/shared/preload');
 			// Platform-level bin directory for a fallback `php` binary. Without it,
 			// PHP may not populate the PHP_BINARY constant.
-			FS.mkdir('/internal/shared/bin');
+			FS.mkdirTree('/internal/shared/bin');
 			const originalOnRuntimeInitialized = Module['onRuntimeInitialized'];
 			Module['onRuntimeInitialized'] = () => {
-				// Dummy PHP binary for PHP to populate the PHP_BINARY constant.
-				FS.writeFile(
+				const { node: phpBinaryNode } = FS.lookupPath(
 					'/internal/shared/bin/php',
-					new TextEncoder().encode('#!/bin/sh\nphp "$@"')
+					{ noent_okay: true }
 				);
-				// It must be executable to be used by PHP.
-				FS.chmod('/internal/shared/bin/php', 0o755);
+				if (!phpBinaryNode) {
+					// Dummy PHP binary for PHP to populate the PHP_BINARY constant.
+					FS.writeFile(
+						'/internal/shared/bin/php',
+						new TextEncoder().encode('#!/bin/sh\nphp "$@"')
+					);
+					// It must be executable to be used by PHP.
+					FS.chmod('/internal/shared/bin/php', 0o755);
+				}
 				originalOnRuntimeInitialized();
 			};
 
@@ -6627,7 +6647,7 @@ export function init(RuntimeName, PHPLoader) {
 					return length;
 				},
 			});
-			FS.mkdev('/internal/stdout', FS.makedev(64, 0));
+			FS.mkdev('/request/stdout', FS.makedev(64, 0));
 
 			FS.registerDevice(FS.makedev(63, 0), {
 				open: () => {},
@@ -6639,7 +6659,7 @@ export function init(RuntimeName, PHPLoader) {
 					return length;
 				},
 			});
-			FS.mkdev('/internal/stderr', FS.makedev(63, 0));
+			FS.mkdev('/request/stderr', FS.makedev(63, 0));
 
 			FS.registerDevice(FS.makedev(62, 0), {
 				open: () => {},
@@ -6651,7 +6671,7 @@ export function init(RuntimeName, PHPLoader) {
 					return length;
 				},
 			});
-			FS.mkdev('/internal/headers', FS.makedev(62, 0));
+			FS.mkdev('/request/headers', FS.makedev(62, 0));
 
 			// Handle events.
 			PHPWASM.EventEmitter = ENVIRONMENT_IS_NODE
@@ -6884,34 +6904,37 @@ export function init(RuntimeName, PHPLoader) {
 
 	var _fd_close = function fd_close(fd) {
 		return Asyncify.handleAsync(async () => {
+			// We have to get the VFS path from the file descriptor
+			// before closing it.
+			const [vfsPath, vfsPathResolutionErrno] =
+				locking.get_vfs_path_from_fd(fd);
+
 			const fdCloseResult = _builtin_fd_close(fd);
 			if (fdCloseResult !== 0 || !locking.maybeLockedFds.has(fd)) {
 				_js_wasm_trace('fd_close(%d) result %d', fd, fdCloseResult);
 				return fdCloseResult;
 			}
 
-			try {
-				const [vfsPath, pathResolutionErrno] =
-					locking.get_vfs_path_from_fd(fd);
-				if (pathResolutionErrno !== 0) {
-					_js_wasm_trace(
-						'fd_close(%d) get_vfs_path_from_fd error %d',
-						fd,
-						pathResolutionErrno
-					);
-					/*
-					 * It looks like the file may have had an associated lock,
-					 * but since we cannot look up the path,
-					 * there is nothing more for us to do.
-					 *
-					 * NOTE: This seems possible for files that are locked and
-					 * then unlinked before close. It is an opportunity for a
-					 * lock to be orphaned in the lock manager.
-					 * @TODO: Explore how to ensure cleanup in this case.
-					 */
-					return fdCloseResult;
-				}
+			if (vfsPathResolutionErrno !== 0) {
+				_js_wasm_trace(
+					'fd_close(%d) get_vfs_path_from_fd error %d',
+					fd,
+					vfsPathResolutionErrno
+				);
+				/*
+				 * It looks like the file may have had an associated lock,
+				 * but since we cannot look up the path,
+				 * there is nothing more for us to do.
+				 *
+				 * NOTE: This seems possible for files that are locked and
+				 * then unlinked before close. It is an opportunity for a
+				 * lock to be orphaned in the lock manager.
+				 * @TODO: Explore how to ensure cleanup in this case.
+				 */
+				return fdCloseResult;
+			}
 
+			try {
 				const nativeFilePath =
 					locking.get_native_path_from_vfs_path(vfsPath);
 				await PHPLoader.fileLockManager.releaseLocksForProcessFd(
@@ -31209,7 +31232,7 @@ export function init(RuntimeName, PHPLoader) {
 	if (ENVIRONMENT_IS_NODE) {
 		NODEFS.staticInit();
 	}
-	PHPWASM.init();
+	PHPWASM.init(PHPLoader?.phpWasmInitOptions);
 
 	Module['requestAnimationFrame'] = MainLoop.requestAnimationFrame;
 	Module['pauseMainLoop'] = MainLoop.pause;
@@ -31275,13 +31298,13 @@ export function init(RuntimeName, PHPLoader) {
 	// End JS library code
 
 	var ASM_CONSTS = {
-		12633246: ($0) => {
+		12633182: ($0) => {
 			if (!$0) {
 				AL.alcErr = 0xa004;
 				return 1;
 			}
 		},
-		12633294: ($0) => {
+		12633230: ($0) => {
 			if (!AL.currentCtx) {
 				err('alGetProcAddress() called without a valid context');
 				return 1;

package/jspi/php_8_4.js

@@ -6578,7 +6578,7 @@ export function init(RuntimeName, PHPLoader) {
 		O_NONBLOCK: 2048,
 		POLLHUP: 16,
 		SETFL_MASK: 3072,
-		init: function () {
+		init: function (phpWasmInitOptions) {
 			Module['ENV'] = Module['ENV'] || {};
 			// Ensure a platform-level bin directory for a fallback `php` binary.
 			Module['ENV']['PATH'] = [
@@ -6588,28 +6588,48 @@ export function init(RuntimeName, PHPLoader) {
 				.filter(Boolean)
 				.join(':');
 
-			// The /internal directory is required by the C module. It's where the
+			// The /request directory is required by the C module. It's where the
 			// stdout, stderr, and headers information are written for the JavaScript
-			// code to read later on.
+			// code to read later on. This is per-request state that is isolated to a
+			// single PHP process.
+			FS.mkdir('/request');
+			// The /internal directory is shared amongst all PHP processes
+			// and contains wp-config.php, constants, etc.
 			FS.mkdir('/internal');
+
+			if (phpWasmInitOptions?.nativeInternalDirPath) {
+				FS.mount(
+					FS.filesystems.NODEFS,
+					{ root: phpWasmInitOptions.nativeInternalDirPath },
+					'/internal'
+				);
+			}
+
 			// The files from the shared directory are shared between all the
 			// PHP processes managed by PHPProcessManager.
-			FS.mkdir('/internal/shared');
+			FS.mkdirTree('/internal/shared');
+
 			// The files from the preload directory are preloaded using the
 			// auto_prepend_file php.ini directive.
-			FS.mkdir('/internal/shared/preload');
+			FS.mkdirTree('/internal/shared/preload');
 			// Platform-level bin directory for a fallback `php` binary. Without it,
 			// PHP may not populate the PHP_BINARY constant.
-			FS.mkdir('/internal/shared/bin');
+			FS.mkdirTree('/internal/shared/bin');
 			const originalOnRuntimeInitialized = Module['onRuntimeInitialized'];
 			Module['onRuntimeInitialized'] = () => {
-				// Dummy PHP binary for PHP to populate the PHP_BINARY constant.
-				FS.writeFile(
+				const { node: phpBinaryNode } = FS.lookupPath(
 					'/internal/shared/bin/php',
-					new TextEncoder().encode('#!/bin/sh\nphp "$@"')
+					{ noent_okay: true }
 				);
-				// It must be executable to be used by PHP.
-				FS.chmod('/internal/shared/bin/php', 0o755);
+				if (!phpBinaryNode) {
+					// Dummy PHP binary for PHP to populate the PHP_BINARY constant.
+					FS.writeFile(
+						'/internal/shared/bin/php',
+						new TextEncoder().encode('#!/bin/sh\nphp "$@"')
+					);
+					// It must be executable to be used by PHP.
+					FS.chmod('/internal/shared/bin/php', 0o755);
+				}
 				originalOnRuntimeInitialized();
 			};
 
@@ -6627,7 +6647,7 @@ export function init(RuntimeName, PHPLoader) {
 					return length;
 				},
 			});
-			FS.mkdev('/internal/stdout', FS.makedev(64, 0));
+			FS.mkdev('/request/stdout', FS.makedev(64, 0));
 
 			FS.registerDevice(FS.makedev(63, 0), {
 				open: () => {},
@@ -6639,7 +6659,7 @@ export function init(RuntimeName, PHPLoader) {
 					return length;
 				},
 			});
-			FS.mkdev('/internal/stderr', FS.makedev(63, 0));
+			FS.mkdev('/request/stderr', FS.makedev(63, 0));
 
 			FS.registerDevice(FS.makedev(62, 0), {
 				open: () => {},
@@ -6651,7 +6671,7 @@ export function init(RuntimeName, PHPLoader) {
 					return length;
 				},
 			});
-			FS.mkdev('/internal/headers', FS.makedev(62, 0));
+			FS.mkdev('/request/headers', FS.makedev(62, 0));
 
 			// Handle events.
 			PHPWASM.EventEmitter = ENVIRONMENT_IS_NODE
@@ -6884,34 +6904,37 @@ export function init(RuntimeName, PHPLoader) {
 
 	var _fd_close = function fd_close(fd) {
 		return Asyncify.handleAsync(async () => {
+			// We have to get the VFS path from the file descriptor
+			// before closing it.
+			const [vfsPath, vfsPathResolutionErrno] =
+				locking.get_vfs_path_from_fd(fd);
+
 			const fdCloseResult = _builtin_fd_close(fd);
 			if (fdCloseResult !== 0 || !locking.maybeLockedFds.has(fd)) {
 				_js_wasm_trace('fd_close(%d) result %d', fd, fdCloseResult);
 				return fdCloseResult;
 			}
 
-			try {
-				const [vfsPath, pathResolutionErrno] =
-					locking.get_vfs_path_from_fd(fd);
-				if (pathResolutionErrno !== 0) {
-					_js_wasm_trace(
-						'fd_close(%d) get_vfs_path_from_fd error %d',
-						fd,
-						pathResolutionErrno
-					);
-					/*
-					 * It looks like the file may have had an associated lock,
-					 * but since we cannot look up the path,
-					 * there is nothing more for us to do.
-					 *
-					 * NOTE: This seems possible for files that are locked and
-					 * then unlinked before close. It is an opportunity for a
-					 * lock to be orphaned in the lock manager.
-					 * @TODO: Explore how to ensure cleanup in this case.
-					 */
-					return fdCloseResult;
-				}
+			if (vfsPathResolutionErrno !== 0) {
+				_js_wasm_trace(
+					'fd_close(%d) get_vfs_path_from_fd error %d',
+					fd,
+					vfsPathResolutionErrno
+				);
+				/*
+				 * It looks like the file may have had an associated lock,
+				 * but since we cannot look up the path,
+				 * there is nothing more for us to do.
+				 *
+				 * NOTE: This seems possible for files that are locked and
+				 * then unlinked before close. It is an opportunity for a
+				 * lock to be orphaned in the lock manager.
+				 * @TODO: Explore how to ensure cleanup in this case.
+				 */
+				return fdCloseResult;
+			}
 
+			try {
 				const nativeFilePath =
 					locking.get_native_path_from_vfs_path(vfsPath);
 				await PHPLoader.fileLockManager.releaseLocksForProcessFd(
@@ -31209,7 +31232,7 @@ export function init(RuntimeName, PHPLoader) {
 	if (ENVIRONMENT_IS_NODE) {
 		NODEFS.staticInit();
 	}
-	PHPWASM.init();
+	PHPWASM.init(PHPLoader?.phpWasmInitOptions);
 
 	Module['requestAnimationFrame'] = MainLoop.requestAnimationFrame;
 	Module['pauseMainLoop'] = MainLoop.pause;

package/lib/load-runtime.d.ts

@@ -36,6 +36,17 @@ type PHPLoaderOptionsForNode = PHPLoaderOptions & {
          * @param args - Arguments to the format string.
          */
         trace?: (processId: number, format: string, ...args: any[]) => void;
+        /**
+         * An optional object to pass to the PHP-WASM library's `init` function.
+         *
+         * phpWasmInitOptions.nativeInternalDirPath is used to mount a
+         * real, native directory as the php-wasm /internal directory.
+         *
+         * @see https://github.com/php-wasm/php-wasm/blob/main/compile/php/phpwasm-emscripten-library.js#L100
+         */
+        phpWasmInitOptions?: {
+            nativeInternalDirPath?: string;
+        };
     };
 };
 /**

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@php-wasm/node",
-  "version": "2.0.22",
+  "version": "3.0.2",
   "description": "PHP.wasm for Node.js",
   "repository": {
     "type": "git",
@@ -38,7 +38,7 @@
   },
   "license": "GPL-2.0-or-later",
   "types": "index.d.ts",
-  "gitHead": "4ba4984b3ab981acafc5d7139258985d345f1caf",
+  "gitHead": "35cc84863d9e92c1e6a5d354bb0727673b461216",
   "engines": {
     "node": ">=20.18.3",
     "npm": ">=10.1.0"
@@ -49,11 +49,11 @@
     "wasm-feature-detect": "1.8.0",
     "ws": "8.18.1",
     "yargs": "17.7.2",
-    "@php-wasm/node-polyfills": "2.0.22",
-    "@php-wasm/universal": "2.0.22",
-    "@php-wasm/logger": "2.0.22",
-    "@php-wasm/util": "2.0.22",
-    "@wp-playground/common": "2.0.22"
+    "@php-wasm/node-polyfills": "3.0.2",
+    "@php-wasm/universal": "3.0.2",
+    "@php-wasm/logger": "3.0.2",
+    "@php-wasm/util": "3.0.2",
+    "@wp-playground/common": "3.0.2"
   },
   "overrides": {
     "rollup": "^4.34.6",