@php-wasm/node 2.0.4 → 2.0.7

package/jspi/php_7_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_7_3.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_7_4.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_0.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_1.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.