@php-wasm/node 2.0.4 → 2.0.7

package/jspi/php_8_2.js

@@ -6994,35 +6994,25 @@ export function init(RuntimeName, PHPLoader) {
 			1: 'exclusive',
 			2: 'unlocked',
 		},
-		is_shared_fs_node(node) {
-			if (node?.isSharedFS) {
-				return true;
-			}
-
-			// Handle PROXYFS nodes which wrap other nodes.
-			if (
-				!node?.mount?.opts?.fs?.lookupPath ||
-				!node?.mount?.type?.realPath
-			) {
-				return false;
+		is_path_to_shared_fs(path) {
+			_js_wasm_trace('is_path_to_shared_fs(%s)', path);
+			const { node } = FS.lookupPath(path, { noent_okay: true });
+			if (node.mount.type !== PROXYFS) {
+				return !!node.isSharedFS;
+			}
+
+			// This looks like a PROXYFS node. Let's try a lookup.
+			const nodePath = PROXYFS.realPath(node);
+			const backingFs = node?.mount?.opts?.fs;
+			if (backingFs) {
+				// Tolerate ENOENT because looking up a MEMFS node by path always fails.
+				const { node: backingNode } = backingFs.lookupPath(nodePath, {
+					noent_okay: true,
+				});
+				return !!backingNode?.isSharedFS;
 			}
 
-			// Only NODEFS can be shared between workers at the moment.
-			if (node.mount.type !== NODEFS) {
-				return false;
-			}
-			const vfsPath = node.mount.type.realPath(node);
-			try {
-				const underlyingNode =
-					node.mount.opts.fs.lookupPath(vfsPath)?.node;
-				return !!underlyingNode?.isSharedFS;
-			} catch (e) {
-				return false;
-			}
-		},
-		is_path_to_shared_fs(path) {
-			const { node } = FS.lookupPath(path);
-			return locking.is_shared_fs_node(node);
+			return false;
 		},
 		get_fd_access_mode(fd) {
 			const emscripten_F_GETFL = Number('3');
@@ -7040,8 +7030,26 @@ export function init(RuntimeName, PHPLoader) {
 			}
 		},
 		get_native_path_from_vfs_path(vfsPath) {
-			const { node } = FS.lookupPath(vfsPath);
-			return NODEFS.realPath(node);
+			// TODO: Should there be a try/catch here?
+			const { node } = FS.lookupPath(vfsPath, {});
+			if (node.mount.type === NODEFS) {
+				return NODEFS.realPath(node);
+			} else if (node.mount.type === PROXYFS) {
+				// TODO: Tolerate ENOENT here?
+				const { node: backingNode, path: backingPath } =
+					node.mount.opts.fs.lookupPath(vfsPath);
+				_js_wasm_trace(
+					'backingNode for %s: %s',
+					vfsPath,
+					backingPath,
+					backingNode
+				);
+				return backingNode.mount.type.realPath(backingNode);
+			} else {
+				throw new Error(
+					`Unsupported filesystem type for path ${vfsPath}`
+				);
+			}
 		},
 		check_lock_params(fd, l_type) {
 			const emscripten_O_RDONLY = Number('0');
@@ -7252,6 +7260,8 @@ export function init(RuntimeName, PHPLoader) {
 						return -ERRNO_CODES.EBADF;
 					}
 
+					const flockStructAddr = syscallGetVarargP();
+
 					if (!locking.is_path_to_shared_fs(vfsPath)) {
 						_js_wasm_trace(
 							"fcntl(%d, F_GETLK) locking is not implemented for non-NodeFS path '%s'",
@@ -7267,7 +7277,6 @@ export function init(RuntimeName, PHPLoader) {
 						return 0;
 					}
 
-					const flockStructAddr = syscallGetVarargP();
 					const flockStruct = read_flock_struct(flockStructAddr);
 
 					if (!(flockStruct.l_type in locking.fcntlToLockState)) {
@@ -34408,19 +34417,16 @@ export function init(RuntimeName, PHPLoader) {
 		// We override NODEFS.createNode() to add an `isSharedFS` flag to all NODEFS
 		// nodes. This way we can tell whether file-locking is needed and possible
 		// for an FS node, even if wrapped with PROXYFS.
-		const originalCreateNode = NODEFS.createNode;
+		const originalNodeFsCreateNode = NODEFS.createNode;
 		NODEFS.createNode = function createNodeWithSharedFlag() {
-			const node = originalCreateNode.apply(NODEFS, arguments);
+			const node = originalNodeFsCreateNode.apply(NODEFS, arguments);
 			node.isSharedFS = true;
 			return node;
 		};
 
 		var originalHashAddNode = FS.hashAddNode;
 		FS.hashAddNode = function hashAddNodeIfNotSharedFS(node) {
-			if (
-				typeof locking === 'object' &&
-				locking?.is_shared_fs_node(node)
-			) {
+			if (node?.isSharedFS) {
 				// Avoid caching shared VFS nodes so multiple instances
 				// can access the same underlying filesystem without
 				// conflicting caches.

package/jspi/php_8_3.js

@@ -6,10 +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_23', 'php_8_3.wasm');
+const dependencyFilename = path.join(__dirname, '8_3_24', 'php_8_3.wasm');
 export { dependencyFilename };
-export const dependenciesTotalSize = 32571921;
-const phpVersionString = '8.3.23';
+export const dependenciesTotalSize = 32572592;
+const phpVersionString = '8.3.24';
 export function init(RuntimeName, PHPLoader) {
 	// The rest of the code comes from the built php.js file and esm-suffix.js
 	// include: shell.js
@@ -1012,7 +1012,7 @@ export function init(RuntimeName, PHPLoader) {
 
 	/** @type {WebAssembly.Table} */
 	var wasmTable = new WebAssembly.Table({
-		initial: 15738,
+		initial: 15739,
 		element: 'anyfunc',
 	});
 	var getWasmTableEntry = (funcPtr) => {
@@ -6994,35 +6994,25 @@ export function init(RuntimeName, PHPLoader) {
 			1: 'exclusive',
 			2: 'unlocked',
 		},
-		is_shared_fs_node(node) {
-			if (node?.isSharedFS) {
-				return true;
-			}
-
-			// Handle PROXYFS nodes which wrap other nodes.
-			if (
-				!node?.mount?.opts?.fs?.lookupPath ||
-				!node?.mount?.type?.realPath
-			) {
-				return false;
+		is_path_to_shared_fs(path) {
+			_js_wasm_trace('is_path_to_shared_fs(%s)', path);
+			const { node } = FS.lookupPath(path, { noent_okay: true });
+			if (node.mount.type !== PROXYFS) {
+				return !!node.isSharedFS;
+			}
+
+			// This looks like a PROXYFS node. Let's try a lookup.
+			const nodePath = PROXYFS.realPath(node);
+			const backingFs = node?.mount?.opts?.fs;
+			if (backingFs) {
+				// Tolerate ENOENT because looking up a MEMFS node by path always fails.
+				const { node: backingNode } = backingFs.lookupPath(nodePath, {
+					noent_okay: true,
+				});
+				return !!backingNode?.isSharedFS;
 			}
 
-			// Only NODEFS can be shared between workers at the moment.
-			if (node.mount.type !== NODEFS) {
-				return false;
-			}
-			const vfsPath = node.mount.type.realPath(node);
-			try {
-				const underlyingNode =
-					node.mount.opts.fs.lookupPath(vfsPath)?.node;
-				return !!underlyingNode?.isSharedFS;
-			} catch (e) {
-				return false;
-			}
-		},
-		is_path_to_shared_fs(path) {
-			const { node } = FS.lookupPath(path);
-			return locking.is_shared_fs_node(node);
+			return false;
 		},
 		get_fd_access_mode(fd) {
 			const emscripten_F_GETFL = Number('3');
@@ -7040,8 +7030,26 @@ export function init(RuntimeName, PHPLoader) {
 			}
 		},
 		get_native_path_from_vfs_path(vfsPath) {
-			const { node } = FS.lookupPath(vfsPath);
-			return NODEFS.realPath(node);
+			// TODO: Should there be a try/catch here?
+			const { node } = FS.lookupPath(vfsPath, {});
+			if (node.mount.type === NODEFS) {
+				return NODEFS.realPath(node);
+			} else if (node.mount.type === PROXYFS) {
+				// TODO: Tolerate ENOENT here?
+				const { node: backingNode, path: backingPath } =
+					node.mount.opts.fs.lookupPath(vfsPath);
+				_js_wasm_trace(
+					'backingNode for %s: %s',
+					vfsPath,
+					backingPath,
+					backingNode
+				);
+				return backingNode.mount.type.realPath(backingNode);
+			} else {
+				throw new Error(
+					`Unsupported filesystem type for path ${vfsPath}`
+				);
+			}
 		},
 		check_lock_params(fd, l_type) {
 			const emscripten_O_RDONLY = Number('0');
@@ -7252,6 +7260,8 @@ export function init(RuntimeName, PHPLoader) {
 						return -ERRNO_CODES.EBADF;
 					}
 
+					const flockStructAddr = syscallGetVarargP();
+
 					if (!locking.is_path_to_shared_fs(vfsPath)) {
 						_js_wasm_trace(
 							"fcntl(%d, F_GETLK) locking is not implemented for non-NodeFS path '%s'",
@@ -7267,7 +7277,6 @@ export function init(RuntimeName, PHPLoader) {
 						return 0;
 					}
 
-					const flockStructAddr = syscallGetVarargP();
 					const flockStruct = read_flock_struct(flockStructAddr);
 
 					if (!(flockStruct.l_type in locking.fcntlToLockState)) {
@@ -31253,13 +31262,13 @@ export function init(RuntimeName, PHPLoader) {
 	// End JS library code
 
 	var ASM_CONSTS = {
-		13232622: ($0) => {
+		13232510: ($0) => {
 			if (!$0) {
 				AL.alcErr = 0xa004;
 				return 1;
 			}
 		},
-		13232670: ($0) => {
+		13232558: ($0) => {
 			if (!AL.currentCtx) {
 				err('alGetProcAddress() called without a valid context');
 				return 1;
@@ -34408,19 +34417,16 @@ export function init(RuntimeName, PHPLoader) {
 		// We override NODEFS.createNode() to add an `isSharedFS` flag to all NODEFS
 		// nodes. This way we can tell whether file-locking is needed and possible
 		// for an FS node, even if wrapped with PROXYFS.
-		const originalCreateNode = NODEFS.createNode;
+		const originalNodeFsCreateNode = NODEFS.createNode;
 		NODEFS.createNode = function createNodeWithSharedFlag() {
-			const node = originalCreateNode.apply(NODEFS, arguments);
+			const node = originalNodeFsCreateNode.apply(NODEFS, arguments);
 			node.isSharedFS = true;
 			return node;
 		};
 
 		var originalHashAddNode = FS.hashAddNode;
 		FS.hashAddNode = function hashAddNodeIfNotSharedFS(node) {
-			if (
-				typeof locking === 'object' &&
-				locking?.is_shared_fs_node(node)
-			) {
+			if (node?.isSharedFS) {
 				// Avoid caching shared VFS nodes so multiple instances
 				// can access the same underlying filesystem without
 				// conflicting caches.

package/jspi/php_8_4.js

@@ -6,10 +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_10', 'php_8_4.wasm');
+const dependencyFilename = path.join(__dirname, '8_4_11', 'php_8_4.wasm');
 export { dependencyFilename };
-export const dependenciesTotalSize = 36372438;
-const phpVersionString = '8.4.10';
+export const dependenciesTotalSize = 36373389;
+const phpVersionString = '8.4.11';
 export function init(RuntimeName, PHPLoader) {
 	// The rest of the code comes from the built php.js file and esm-suffix.js
 	// include: shell.js
@@ -1012,7 +1012,7 @@ export function init(RuntimeName, PHPLoader) {
 
 	/** @type {WebAssembly.Table} */
 	var wasmTable = new WebAssembly.Table({
-		initial: 16555,
+		initial: 16556,
 		element: 'anyfunc',
 	});
 	var getWasmTableEntry = (funcPtr) => {
@@ -6994,35 +6994,25 @@ export function init(RuntimeName, PHPLoader) {
 			1: 'exclusive',
 			2: 'unlocked',
 		},
-		is_shared_fs_node(node) {
-			if (node?.isSharedFS) {
-				return true;
-			}
-
-			// Handle PROXYFS nodes which wrap other nodes.
-			if (
-				!node?.mount?.opts?.fs?.lookupPath ||
-				!node?.mount?.type?.realPath
-			) {
-				return false;
+		is_path_to_shared_fs(path) {
+			_js_wasm_trace('is_path_to_shared_fs(%s)', path);
+			const { node } = FS.lookupPath(path, { noent_okay: true });
+			if (node.mount.type !== PROXYFS) {
+				return !!node.isSharedFS;
+			}
+
+			// This looks like a PROXYFS node. Let's try a lookup.
+			const nodePath = PROXYFS.realPath(node);
+			const backingFs = node?.mount?.opts?.fs;
+			if (backingFs) {
+				// Tolerate ENOENT because looking up a MEMFS node by path always fails.
+				const { node: backingNode } = backingFs.lookupPath(nodePath, {
+					noent_okay: true,
+				});
+				return !!backingNode?.isSharedFS;
 			}
 
-			// Only NODEFS can be shared between workers at the moment.
-			if (node.mount.type !== NODEFS) {
-				return false;
-			}
-			const vfsPath = node.mount.type.realPath(node);
-			try {
-				const underlyingNode =
-					node.mount.opts.fs.lookupPath(vfsPath)?.node;
-				return !!underlyingNode?.isSharedFS;
-			} catch (e) {
-				return false;
-			}
-		},
-		is_path_to_shared_fs(path) {
-			const { node } = FS.lookupPath(path);
-			return locking.is_shared_fs_node(node);
+			return false;
 		},
 		get_fd_access_mode(fd) {
 			const emscripten_F_GETFL = Number('3');
@@ -7040,8 +7030,26 @@ export function init(RuntimeName, PHPLoader) {
 			}
 		},
 		get_native_path_from_vfs_path(vfsPath) {
-			const { node } = FS.lookupPath(vfsPath);
-			return NODEFS.realPath(node);
+			// TODO: Should there be a try/catch here?
+			const { node } = FS.lookupPath(vfsPath, {});
+			if (node.mount.type === NODEFS) {
+				return NODEFS.realPath(node);
+			} else if (node.mount.type === PROXYFS) {
+				// TODO: Tolerate ENOENT here?
+				const { node: backingNode, path: backingPath } =
+					node.mount.opts.fs.lookupPath(vfsPath);
+				_js_wasm_trace(
+					'backingNode for %s: %s',
+					vfsPath,
+					backingPath,
+					backingNode
+				);
+				return backingNode.mount.type.realPath(backingNode);
+			} else {
+				throw new Error(
+					`Unsupported filesystem type for path ${vfsPath}`
+				);
+			}
 		},
 		check_lock_params(fd, l_type) {
 			const emscripten_O_RDONLY = Number('0');
@@ -7252,6 +7260,8 @@ export function init(RuntimeName, PHPLoader) {
 						return -ERRNO_CODES.EBADF;
 					}
 
+					const flockStructAddr = syscallGetVarargP();
+
 					if (!locking.is_path_to_shared_fs(vfsPath)) {
 						_js_wasm_trace(
 							"fcntl(%d, F_GETLK) locking is not implemented for non-NodeFS path '%s'",
@@ -7267,7 +7277,6 @@ export function init(RuntimeName, PHPLoader) {
 						return 0;
 					}
 
-					const flockStructAddr = syscallGetVarargP();
 					const flockStruct = read_flock_struct(flockStructAddr);
 
 					if (!(flockStruct.l_type in locking.fcntlToLockState)) {
@@ -31253,13 +31262,13 @@ export function init(RuntimeName, PHPLoader) {
 	// End JS library code
 
 	var ASM_CONSTS = {
-		16328094: ($0) => {
+		16328046: ($0) => {
 			if (!$0) {
 				AL.alcErr = 0xa004;
 				return 1;
 			}
 		},
-		16328142: ($0) => {
+		16328094: ($0) => {
 			if (!AL.currentCtx) {
 				err('alGetProcAddress() called without a valid context');
 				return 1;
@@ -34408,19 +34417,16 @@ export function init(RuntimeName, PHPLoader) {
 		// We override NODEFS.createNode() to add an `isSharedFS` flag to all NODEFS
 		// nodes. This way we can tell whether file-locking is needed and possible
 		// for an FS node, even if wrapped with PROXYFS.
-		const originalCreateNode = NODEFS.createNode;
+		const originalNodeFsCreateNode = NODEFS.createNode;
 		NODEFS.createNode = function createNodeWithSharedFlag() {
-			const node = originalCreateNode.apply(NODEFS, arguments);
+			const node = originalNodeFsCreateNode.apply(NODEFS, arguments);
 			node.isSharedFS = true;
 			return node;
 		};
 
 		var originalHashAddNode = FS.hashAddNode;
 		FS.hashAddNode = function hashAddNodeIfNotSharedFS(node) {
-			if (
-				typeof locking === 'object' &&
-				locking?.is_shared_fs_node(node)
-			) {
+			if (node?.isSharedFS) {
 				// Avoid caching shared VFS nodes so multiple instances
 				// can access the same underlying filesystem without
 				// conflicting caches.

package/lib/file-lock-manager-for-node.d.ts

@@ -147,11 +147,18 @@ export declare class FileLock {
      */
     private ensureCompatibleNativeLock;
     /**
-     * Check if a conflicting lock exists.
+     * Check if a lock exists that conflicts with the requested range lock.
      *
      * @param requestedLock The desired byte range lock.
      * @returns True if a conflicting lock exists, false otherwise.
      */
-    private doesAConflictingLockExist;
+    private isThereAConflictWithRequestedRangeLock;
+    /**
+     * Check if a lock exists that conflicts with the requested whole-file lock.
+     *
+     * @param requestedLock The desired whole-file lock.
+     * @returns True if a conflicting lock exists, false otherwise.
+     */
+    private isThereAConflictWithRequestedWholeFileLock;
 }
 export {};

package/lib/load-runtime.d.ts

@@ -1,5 +1,6 @@
 import type { SupportedPHPVersion, EmscriptenOptions, RemoteAPI } from '@php-wasm/universal';
 import type { FileLockManager } from './file-lock-manager';
+import type { Promised } from '@php-wasm/util';
 export interface PHPLoaderOptions {
     emscriptenOptions?: EmscriptenOptions;
     followSymlinks?: boolean;
@@ -25,7 +26,7 @@ type PHPLoaderOptionsForNode = PHPLoaderOptions & {
          * file lock managers are supported.
          * When running with Asyncify, the file lock manager must be synchronous.
          */
-        fileLockManager?: RemoteAPI<FileLockManager> | FileLockManager;
+        fileLockManager?: RemoteAPI<FileLockManager> | Promised<FileLockManager> | FileLockManager;
         /**
          * An optional function to collect trace messages.
          *

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@php-wasm/node",
-  "version": "2.0.4",
+  "version": "2.0.7",
   "description": "PHP.wasm for Node.js",
   "repository": {
     "type": "git",
@@ -38,7 +38,7 @@
   },
   "license": "GPL-2.0-or-later",
   "types": "index.d.ts",
-  "gitHead": "8fc1b0f5379a854c9df792c14da17a2ba697e562",
+  "gitHead": "025d757fb86aaaae722819154a73fc8b6c728cc7",
   "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.4",
-    "@php-wasm/universal": "2.0.4",
-    "@php-wasm/logger": "2.0.4",
-    "@php-wasm/util": "2.0.4",
-    "@wp-playground/common": "2.0.4"
+    "@php-wasm/node-polyfills": "2.0.7",
+    "@php-wasm/universal": "2.0.7",
+    "@php-wasm/logger": "2.0.7",
+    "@php-wasm/util": "2.0.7",
+    "@wp-playground/common": "2.0.7"
   },
   "overrides": {
     "rollup": "^4.34.6",