@php-wasm/node 1.2.2 → 2.0.0

package/jspi/php_8_2.js

@@ -6,9 +6,10 @@ const require = createRequire(import.meta.url);
 // Note: The path module is currently needed by code injected by the php-wasm Dockerfile.
 import path from 'path';
 
-const dependencyFilename = path.join(__dirname, '8_2_10', 'php_8_2.wasm');
+const dependencyFilename = path.join(__dirname, '8_2_29', 'php_8_2.wasm');
 export { dependencyFilename };
-export const dependenciesTotalSize = 31311784;
+export const dependenciesTotalSize = 31474550;
+const phpVersionString = '8.2.29';
 export function init(RuntimeName, PHPLoader) {
 	// The rest of the code comes from the built php.js file and esm-suffix.js
 	// include: shell.js
@@ -847,7 +848,7 @@ export function init(RuntimeName, PHPLoader) {
 		},
 	};
 
-	var ___heap_base = 13258656;
+	var ___heap_base = 14295392;
 
 	var alignMemory = (size, alignment) => {
 		return Math.ceil(size / alignment) * alignment;
@@ -1011,7 +1012,7 @@ export function init(RuntimeName, PHPLoader) {
 
 	/** @type {WebAssembly.Table} */
 	var wasmTable = new WebAssembly.Table({
-		initial: 15615,
+		initial: 15696,
 		element: 'anyfunc',
 	});
 	var getWasmTableEntry = (funcPtr) => {
@@ -1742,13 +1743,13 @@ export function init(RuntimeName, PHPLoader) {
 		1024
 	);
 
-	var ___stack_high = 13258656;
+	var ___stack_high = 14295392;
 
-	var ___stack_low = 13193120;
+	var ___stack_low = 13246816;
 
 	var ___stack_pointer = new WebAssembly.Global(
 		{ value: 'i32', mutable: true },
-		13258656
+		14295392
 	);
 
 	var PATH = {
@@ -3802,10 +3803,6 @@ export function init(RuntimeName, PHPLoader) {
 				if (FS.isMountpoint(node)) {
 					throw new FS.ErrnoError(10);
 				}
-
-				if (!FS.isDir(node.mode)) {
-					throw new FS.ErrnoError(54);
-				}
 			}
 
 			var mount = {
@@ -6885,7 +6882,7 @@ export function init(RuntimeName, PHPLoader) {
 		}
 	}
 
-	function _fd_close(fd) {
+	var _fd_close = function fd_close(fd) {
 		return Asyncify.handleAsync(async () => {
 			const [vfsPath, pathResolutionErrno] =
 				locking.get_vfs_path_from_fd(fd);
@@ -6920,7 +6917,7 @@ export function init(RuntimeName, PHPLoader) {
 			}
 			return result;
 		});
-	}
+	};
 	_fd_close.sig = 'ii';
 	function _builtin_fd_close(fd) {
 		try {
@@ -19335,7 +19332,7 @@ export function init(RuntimeName, PHPLoader) {
 
 	var addOnExit = (cb) => onExits.unshift(cb);
 
-	var STACK_SIZE = 65536;
+	var STACK_SIZE = 1048576;
 
 	var STACK_ALIGN = 16;
 
@@ -31256,13 +31253,13 @@ export function init(RuntimeName, PHPLoader) {
 	// End JS library code
 
 	var ASM_CONSTS = {
-		12264791: ($0) => {
+		12281038: ($0) => {
 			if (!$0) {
 				AL.alcErr = 0xa004;
 				return 1;
 			}
 		},
-		12264839: ($0) => {
+		12281086: ($0) => {
 			if (!AL.currentCtx) {
 				err('alGetProcAddress() called without a valid context');
 				return 1;
@@ -31390,6 +31387,9 @@ export function init(RuntimeName, PHPLoader) {
 							while (true) {
 								var mask = POLLNVAL;
 								mask = SYSCALLS.DEFAULT_POLLMASK;
+								if (FS.isClosed(stream)) {
+									return ERRNO_CODES.EBADF;
+								}
 								if (stream.stream_ops?.poll) {
 									mask = stream.stream_ops.poll(stream, -1);
 								}
@@ -34100,6 +34100,11 @@ export function init(RuntimeName, PHPLoader) {
 	var _calloc = (a0, a1) => (_calloc = wasmExports['calloc'])(a0, a1);
 	var _flock = (Module['_flock'] = (a0, a1) =>
 		(_flock = Module['_flock'] = wasmExports['flock'])(a0, a1));
+	var _initgroups = (Module['_initgroups'] = (a0, a1) =>
+		(_initgroups = Module['_initgroups'] = wasmExports['initgroups'])(
+			a0,
+			a1
+		));
 	var _wasm_read = (Module['_wasm_read'] = (a0, a1, a2) =>
 		(_wasm_read = Module['_wasm_read'] = wasmExports['wasm_read'])(
 			a0,
@@ -34425,6 +34430,15 @@ export function init(RuntimeName, PHPLoader) {
 		};
 	}
 
+	/**
+	 * Expose the PHP version so the PHP class can make version-specific
+	 * adjustments to `php.ini`.
+	 */
+	PHPLoader['phpVersion'] = (() => {
+		const [major, minor, patch] = phpVersionString.split('.').map(Number);
+		return { major, minor, patch };
+	})();
+
 	return PHPLoader;
 
 	// Close the opening bracket from esm-prefix.js:

package/jspi/php_8_3.js

@@ -6,9 +6,10 @@ const require = createRequire(import.meta.url);
 // Note: The path module is currently needed by code injected by the php-wasm Dockerfile.
 import path from 'path';
 
-const dependencyFilename = path.join(__dirname, '8_3_0', 'php_8_3.wasm');
+const dependencyFilename = path.join(__dirname, '8_3_23', 'php_8_3.wasm');
 export { dependencyFilename };
-export const dependenciesTotalSize = 32388923;
+export const dependenciesTotalSize = 32571921;
+const phpVersionString = '8.3.23';
 export function init(RuntimeName, PHPLoader) {
 	// The rest of the code comes from the built php.js file and esm-suffix.js
 	// include: shell.js
@@ -847,7 +848,7 @@ export function init(RuntimeName, PHPLoader) {
 		},
 	};
 
-	var ___heap_base = 14208864;
+	var ___heap_base = 15214368;
 
 	var alignMemory = (size, alignment) => {
 		return Math.ceil(size / alignment) * alignment;
@@ -1011,7 +1012,7 @@ export function init(RuntimeName, PHPLoader) {
 
 	/** @type {WebAssembly.Table} */
 	var wasmTable = new WebAssembly.Table({
-		initial: 15668,
+		initial: 15738,
 		element: 'anyfunc',
 	});
 	var getWasmTableEntry = (funcPtr) => {
@@ -1742,13 +1743,13 @@ export function init(RuntimeName, PHPLoader) {
 		1024
 	);
 
-	var ___stack_high = 14208864;
+	var ___stack_high = 15214368;
 
-	var ___stack_low = 14143328;
+	var ___stack_low = 14165792;
 
 	var ___stack_pointer = new WebAssembly.Global(
 		{ value: 'i32', mutable: true },
-		14208864
+		15214368
 	);
 
 	var PATH = {
@@ -3802,10 +3803,6 @@ export function init(RuntimeName, PHPLoader) {
 				if (FS.isMountpoint(node)) {
 					throw new FS.ErrnoError(10);
 				}
-
-				if (!FS.isDir(node.mode)) {
-					throw new FS.ErrnoError(54);
-				}
 			}
 
 			var mount = {
@@ -6885,7 +6882,7 @@ export function init(RuntimeName, PHPLoader) {
 		}
 	}
 
-	function _fd_close(fd) {
+	var _fd_close = function fd_close(fd) {
 		return Asyncify.handleAsync(async () => {
 			const [vfsPath, pathResolutionErrno] =
 				locking.get_vfs_path_from_fd(fd);
@@ -6920,7 +6917,7 @@ export function init(RuntimeName, PHPLoader) {
 			}
 			return result;
 		});
-	}
+	};
 	_fd_close.sig = 'ii';
 	function _builtin_fd_close(fd) {
 		try {
@@ -19335,7 +19332,7 @@ export function init(RuntimeName, PHPLoader) {
 
 	var addOnExit = (cb) => onExits.unshift(cb);
 
-	var STACK_SIZE = 65536;
+	var STACK_SIZE = 1048576;
 
 	var STACK_ALIGN = 16;
 
@@ -31256,13 +31253,13 @@ export function init(RuntimeName, PHPLoader) {
 	// End JS library code
 
 	var ASM_CONSTS = {
-		13214775: ($0) => {
+		13232622: ($0) => {
 			if (!$0) {
 				AL.alcErr = 0xa004;
 				return 1;
 			}
 		},
-		13214823: ($0) => {
+		13232670: ($0) => {
 			if (!AL.currentCtx) {
 				err('alGetProcAddress() called without a valid context');
 				return 1;
@@ -31390,6 +31387,9 @@ export function init(RuntimeName, PHPLoader) {
 							while (true) {
 								var mask = POLLNVAL;
 								mask = SYSCALLS.DEFAULT_POLLMASK;
+								if (FS.isClosed(stream)) {
+									return ERRNO_CODES.EBADF;
+								}
 								if (stream.stream_ops?.poll) {
 									mask = stream.stream_ops.poll(stream, -1);
 								}
@@ -34100,6 +34100,11 @@ export function init(RuntimeName, PHPLoader) {
 	var _calloc = (a0, a1) => (_calloc = wasmExports['calloc'])(a0, a1);
 	var _flock = (Module['_flock'] = (a0, a1) =>
 		(_flock = Module['_flock'] = wasmExports['flock'])(a0, a1));
+	var _initgroups = (Module['_initgroups'] = (a0, a1) =>
+		(_initgroups = Module['_initgroups'] = wasmExports['initgroups'])(
+			a0,
+			a1
+		));
 	var _wasm_read = (Module['_wasm_read'] = (a0, a1, a2) =>
 		(_wasm_read = Module['_wasm_read'] = wasmExports['wasm_read'])(
 			a0,
@@ -34425,6 +34430,15 @@ export function init(RuntimeName, PHPLoader) {
 		};
 	}
 
+	/**
+	 * Expose the PHP version so the PHP class can make version-specific
+	 * adjustments to `php.ini`.
+	 */
+	PHPLoader['phpVersion'] = (() => {
+		const [major, minor, patch] = phpVersionString.split('.').map(Number);
+		return { major, minor, patch };
+	})();
+
 	return PHPLoader;
 
 	// Close the opening bracket from esm-prefix.js:

package/jspi/php_8_4.js

@@ -6,9 +6,10 @@ const require = createRequire(import.meta.url);
 // Note: The path module is currently needed by code injected by the php-wasm Dockerfile.
 import path from 'path';
 
-const dependencyFilename = path.join(__dirname, '8_4_0', 'php_8_4.wasm');
+const dependencyFilename = path.join(__dirname, '8_4_10', 'php_8_4.wasm');
 export { dependencyFilename };
-export const dependenciesTotalSize = 36202422;
+export const dependenciesTotalSize = 36372438;
+const phpVersionString = '8.4.10';
 export function init(RuntimeName, PHPLoader) {
 	// The rest of the code comes from the built php.js file and esm-suffix.js
 	// include: shell.js
@@ -847,7 +848,7 @@ export function init(RuntimeName, PHPLoader) {
 		},
 	};
 
-	var ___heap_base = 17317728;
+	var ___heap_base = 18314400;
 
 	var alignMemory = (size, alignment) => {
 		return Math.ceil(size / alignment) * alignment;
@@ -1011,7 +1012,7 @@ export function init(RuntimeName, PHPLoader) {
 
 	/** @type {WebAssembly.Table} */
 	var wasmTable = new WebAssembly.Table({
-		initial: 16487,
+		initial: 16555,
 		element: 'anyfunc',
 	});
 	var getWasmTableEntry = (funcPtr) => {
@@ -1742,13 +1743,13 @@ export function init(RuntimeName, PHPLoader) {
 		1024
 	);
 
-	var ___stack_high = 17317728;
+	var ___stack_high = 18314400;
 
-	var ___stack_low = 17252192;
+	var ___stack_low = 17265824;
 
 	var ___stack_pointer = new WebAssembly.Global(
 		{ value: 'i32', mutable: true },
-		17317728
+		18314400
 	);
 
 	var PATH = {
@@ -3802,10 +3803,6 @@ export function init(RuntimeName, PHPLoader) {
 				if (FS.isMountpoint(node)) {
 					throw new FS.ErrnoError(10);
 				}
-
-				if (!FS.isDir(node.mode)) {
-					throw new FS.ErrnoError(54);
-				}
 			}
 
 			var mount = {
@@ -6885,7 +6882,7 @@ export function init(RuntimeName, PHPLoader) {
 		}
 	}
 
-	function _fd_close(fd) {
+	var _fd_close = function fd_close(fd) {
 		return Asyncify.handleAsync(async () => {
 			const [vfsPath, pathResolutionErrno] =
 				locking.get_vfs_path_from_fd(fd);
@@ -6920,7 +6917,7 @@ export function init(RuntimeName, PHPLoader) {
 			}
 			return result;
 		});
-	}
+	};
 	_fd_close.sig = 'ii';
 	function _builtin_fd_close(fd) {
 		try {
@@ -19335,7 +19332,7 @@ export function init(RuntimeName, PHPLoader) {
 
 	var addOnExit = (cb) => onExits.unshift(cb);
 
-	var STACK_SIZE = 65536;
+	var STACK_SIZE = 1048576;
 
 	var STACK_ALIGN = 16;
 
@@ -31256,13 +31253,13 @@ export function init(RuntimeName, PHPLoader) {
 	// End JS library code
 
 	var ASM_CONSTS = {
-		16319223: ($0) => {
+		16328094: ($0) => {
 			if (!$0) {
 				AL.alcErr = 0xa004;
 				return 1;
 			}
 		},
-		16319271: ($0) => {
+		16328142: ($0) => {
 			if (!AL.currentCtx) {
 				err('alGetProcAddress() called without a valid context');
 				return 1;
@@ -31390,6 +31387,9 @@ export function init(RuntimeName, PHPLoader) {
 							while (true) {
 								var mask = POLLNVAL;
 								mask = SYSCALLS.DEFAULT_POLLMASK;
+								if (FS.isClosed(stream)) {
+									return ERRNO_CODES.EBADF;
+								}
 								if (stream.stream_ops?.poll) {
 									mask = stream.stream_ops.poll(stream, -1);
 								}
@@ -34100,6 +34100,11 @@ export function init(RuntimeName, PHPLoader) {
 		(___cxa_throw = wasmExports['__cxa_throw'])(a0, a1, a2);
 	var _flock = (Module['_flock'] = (a0, a1) =>
 		(_flock = Module['_flock'] = wasmExports['flock'])(a0, a1));
+	var _initgroups = (Module['_initgroups'] = (a0, a1) =>
+		(_initgroups = Module['_initgroups'] = wasmExports['initgroups'])(
+			a0,
+			a1
+		));
 	var _wasm_read = (Module['_wasm_read'] = (a0, a1, a2) =>
 		(_wasm_read = Module['_wasm_read'] = wasmExports['wasm_read'])(
 			a0,
@@ -34425,6 +34430,15 @@ export function init(RuntimeName, PHPLoader) {
 		};
 	}
 
+	/**
+	 * Expose the PHP version so the PHP class can make version-specific
+	 * adjustments to `php.ini`.
+	 */
+	PHPLoader['phpVersion'] = (() => {
+		const [major, minor, patch] = phpVersionString.split('.').map(Number);
+		return { major, minor, patch };
+	})();
+
 	return PHPLoader;
 
 	// Close the opening bracket from esm-prefix.js:

package/lib/node-fs-mount.d.ts

@@ -1,2 +1,2 @@
-import type { MountHandler } from '@php-wasm/universal';
+import { type MountHandler } from '@php-wasm/universal';
 export declare function createNodeFsMountHandler(localPath: string): MountHandler;

package/package.json

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