@php-wasm/node 2.0.18 → 2.0.19

package/asyncify/php_7_2.js

@@ -6926,24 +6926,36 @@ export function init(RuntimeName, PHPLoader) {
 	}
 
 	function _fd_close(fd) {
-		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
-			);
-			return -ERRNO_CODES.EBADF;
-		}
-
-		const result = _builtin_fd_close(fd);
-		if (result !== 0 || !locking.maybeLockedFds.has(fd)) {
-			_js_wasm_trace('fd_close(%d) result %d', fd, result);
-			return result;
+		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;
 		}
-		const nativeFilePath = locking.get_native_path_from_vfs_path(vfsPath);
 
 		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;
+			}
+
+			const nativeFilePath =
+				locking.get_native_path_from_vfs_path(vfsPath);
 			PHPLoader.fileLockManager.releaseLocksForProcessFd(
 				PHPLoader.processId,
 				fd,
@@ -6955,7 +6967,7 @@ export function init(RuntimeName, PHPLoader) {
 		} finally {
 			locking.maybeLockedFds.delete(fd);
 		}
-		return result;
+		return fdCloseResult;
 	}
 	_fd_close.sig = 'ii';
 	function _builtin_fd_close(fd) {
@@ -7069,8 +7081,12 @@ export function init(RuntimeName, PHPLoader) {
 			}
 		},
 		get_native_path_from_vfs_path(vfsPath) {
-			// TODO: Should there be a try/catch here?
-			const { node } = FS.lookupPath(vfsPath, {});
+			const { node } = FS.lookupPath(vfsPath, {
+				noent_okay: true,
+			});
+			if (!node) {
+				throw new Error(`No node found for VFS path ${vfsPath}`);
+			}
 			if (node.mount.type === NODEFS) {
 				return NODEFS.realPath(node);
 			} else if (node.mount.type === PROXYFS) {
@@ -7340,10 +7356,9 @@ export function init(RuntimeName, PHPLoader) {
 					return -ERRNO_CODES.EINVAL;
 				}
 
-				const nativeFilePath =
-					locking.get_native_path_from_vfs_path(vfsPath);
-
 				try {
+					const nativeFilePath =
+						locking.get_native_path_from_vfs_path(vfsPath);
 					const conflictingLock =
 						PHPLoader.fileLockManager.findFirstConflictingByteRangeLock(
 							nativeFilePath,
@@ -7477,16 +7492,16 @@ export function init(RuntimeName, PHPLoader) {
 					pid,
 				};
 
-				const nativeFilePath =
-					locking.get_native_path_from_vfs_path(vfsPath);
-				_js_wasm_trace(
-					'fcntl(%d, F_SETLK) %s calling lockFileByteRange for range lock %s',
-					fd,
-					vfsPath,
-					rangeLock
-				);
-
 				try {
+					const nativeFilePath =
+						locking.get_native_path_from_vfs_path(vfsPath);
+					_js_wasm_trace(
+						'fcntl(%d, F_SETLK) %s calling lockFileByteRange for range lock %s',
+						fd,
+						vfsPath,
+						rangeLock
+					);
+
 					const succeeded =
 						PHPLoader.fileLockManager.lockFileByteRange(
 							nativeFilePath,
@@ -17403,8 +17418,9 @@ export function init(RuntimeName, PHPLoader) {
 			return -ERRNO_CODES.EINVAL;
 		}
 
-		const nativeFilePath = locking.get_native_path_from_vfs_path(vfsPath);
 		try {
+			const nativeFilePath =
+				locking.get_native_path_from_vfs_path(vfsPath);
 			const obtainedLock = PHPLoader.fileLockManager.lockWholeFile(
 				nativeFilePath,
 				{
@@ -17740,9 +17756,9 @@ export function init(RuntimeName, PHPLoader) {
 					if (!cp.stdin.closed) {
 						cp.stdin.end();
 					}
-					_free(buffer);
-					_free(iov);
-					_free(pnum);
+					PHPLoader['free'](buffer);
+					PHPLoader['free'](iov);
+					PHPLoader['free'](pnum);
 				}
 
 				// pump() can never alter the result of this function.
@@ -18567,6 +18583,11 @@ export function init(RuntimeName, PHPLoader) {
 		return ret;
 	};
 
+	var setErrNo = (value) => {
+		HEAP32[___errno_location() >> 2] = value;
+		return value;
+	};
+
 	var FS_createPath = FS.createPath;
 
 	var FS_unlink = (path) => FS.unlink(path);
@@ -31583,11 +31604,6 @@ export function init(RuntimeName, PHPLoader) {
 
 	var allocateUTF8 = stringToNewUTF8;
 
-	var setErrNo = (value) => {
-		HEAP32[___errno_location() >> 2] = value;
-		return value;
-	};
-
 	var demangle = (func) => {
 		// If demangle has failed before, stop demangling any further function names
 		// This avoids an infinite recursion with malloc()->abort()->stackTrace()->demangle()->malloc()->...
@@ -35479,6 +35495,7 @@ export function init(RuntimeName, PHPLoader) {
 	Module['FS_createDevice'] = FS_createDevice;
 	Module['FS_createDataFile'] = FS_createDataFile;
 	Module['FS_createLazyFile'] = FS_createLazyFile;
+	Module['setErrNo'] = setErrNo;
 	Module['PROXYFS'] = PROXYFS;
 
 	function callMain(args = []) {

package/asyncify/php_7_3.js

@@ -6926,24 +6926,36 @@ export function init(RuntimeName, PHPLoader) {
 	}
 
 	function _fd_close(fd) {
-		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
-			);
-			return -ERRNO_CODES.EBADF;
-		}
-
-		const result = _builtin_fd_close(fd);
-		if (result !== 0 || !locking.maybeLockedFds.has(fd)) {
-			_js_wasm_trace('fd_close(%d) result %d', fd, result);
-			return result;
+		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;
 		}
-		const nativeFilePath = locking.get_native_path_from_vfs_path(vfsPath);
 
 		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;
+			}
+
+			const nativeFilePath =
+				locking.get_native_path_from_vfs_path(vfsPath);
 			PHPLoader.fileLockManager.releaseLocksForProcessFd(
 				PHPLoader.processId,
 				fd,
@@ -6955,7 +6967,7 @@ export function init(RuntimeName, PHPLoader) {
 		} finally {
 			locking.maybeLockedFds.delete(fd);
 		}
-		return result;
+		return fdCloseResult;
 	}
 	_fd_close.sig = 'ii';
 	function _builtin_fd_close(fd) {
@@ -7069,8 +7081,12 @@ export function init(RuntimeName, PHPLoader) {
 			}
 		},
 		get_native_path_from_vfs_path(vfsPath) {
-			// TODO: Should there be a try/catch here?
-			const { node } = FS.lookupPath(vfsPath, {});
+			const { node } = FS.lookupPath(vfsPath, {
+				noent_okay: true,
+			});
+			if (!node) {
+				throw new Error(`No node found for VFS path ${vfsPath}`);
+			}
 			if (node.mount.type === NODEFS) {
 				return NODEFS.realPath(node);
 			} else if (node.mount.type === PROXYFS) {
@@ -7340,10 +7356,9 @@ export function init(RuntimeName, PHPLoader) {
 					return -ERRNO_CODES.EINVAL;
 				}
 
-				const nativeFilePath =
-					locking.get_native_path_from_vfs_path(vfsPath);
-
 				try {
+					const nativeFilePath =
+						locking.get_native_path_from_vfs_path(vfsPath);
 					const conflictingLock =
 						PHPLoader.fileLockManager.findFirstConflictingByteRangeLock(
 							nativeFilePath,
@@ -7477,16 +7492,16 @@ export function init(RuntimeName, PHPLoader) {
 					pid,
 				};
 
-				const nativeFilePath =
-					locking.get_native_path_from_vfs_path(vfsPath);
-				_js_wasm_trace(
-					'fcntl(%d, F_SETLK) %s calling lockFileByteRange for range lock %s',
-					fd,
-					vfsPath,
-					rangeLock
-				);
-
 				try {
+					const nativeFilePath =
+						locking.get_native_path_from_vfs_path(vfsPath);
+					_js_wasm_trace(
+						'fcntl(%d, F_SETLK) %s calling lockFileByteRange for range lock %s',
+						fd,
+						vfsPath,
+						rangeLock
+					);
+
 					const succeeded =
 						PHPLoader.fileLockManager.lockFileByteRange(
 							nativeFilePath,
@@ -17403,8 +17418,9 @@ export function init(RuntimeName, PHPLoader) {
 			return -ERRNO_CODES.EINVAL;
 		}
 
-		const nativeFilePath = locking.get_native_path_from_vfs_path(vfsPath);
 		try {
+			const nativeFilePath =
+				locking.get_native_path_from_vfs_path(vfsPath);
 			const obtainedLock = PHPLoader.fileLockManager.lockWholeFile(
 				nativeFilePath,
 				{
@@ -17740,9 +17756,9 @@ export function init(RuntimeName, PHPLoader) {
 					if (!cp.stdin.closed) {
 						cp.stdin.end();
 					}
-					_free(buffer);
-					_free(iov);
-					_free(pnum);
+					PHPLoader['free'](buffer);
+					PHPLoader['free'](iov);
+					PHPLoader['free'](pnum);
 				}
 
 				// pump() can never alter the result of this function.
@@ -18567,6 +18583,11 @@ export function init(RuntimeName, PHPLoader) {
 		return ret;
 	};
 
+	var setErrNo = (value) => {
+		HEAP32[___errno_location() >> 2] = value;
+		return value;
+	};
+
 	var FS_createPath = FS.createPath;
 
 	var FS_unlink = (path) => FS.unlink(path);
@@ -31583,11 +31604,6 @@ export function init(RuntimeName, PHPLoader) {
 
 	var allocateUTF8 = stringToNewUTF8;
 
-	var setErrNo = (value) => {
-		HEAP32[___errno_location() >> 2] = value;
-		return value;
-	};
-
 	var demangle = (func) => {
 		// If demangle has failed before, stop demangling any further function names
 		// This avoids an infinite recursion with malloc()->abort()->stackTrace()->demangle()->malloc()->...
@@ -35493,6 +35509,7 @@ export function init(RuntimeName, PHPLoader) {
 	Module['FS_createDevice'] = FS_createDevice;
 	Module['FS_createDataFile'] = FS_createDataFile;
 	Module['FS_createLazyFile'] = FS_createLazyFile;
+	Module['setErrNo'] = setErrNo;
 	Module['PROXYFS'] = PROXYFS;
 
 	function callMain(args = []) {

package/asyncify/php_7_4.js

@@ -8,7 +8,7 @@ import path from 'path';
 
 const dependencyFilename = path.join(__dirname, '7_4_33', 'php_7_4.wasm');
 export { dependencyFilename };
-export const dependenciesTotalSize = 23626796;
+export const dependenciesTotalSize = 23626844;
 const phpVersionString = '7.4.33';
 export function init(RuntimeName, PHPLoader) {
 	// The rest of the code comes from the built php.js file and esm-suffix.js
@@ -831,7 +831,7 @@ export function init(RuntimeName, PHPLoader) {
 		},
 	};
 
-	var ___heap_base = 11742016;
+	var ___heap_base = 11742080;
 
 	var alignMemory = (size, alignment) => {
 		return Math.ceil(size / alignment) * alignment;
@@ -1786,13 +1786,13 @@ export function init(RuntimeName, PHPLoader) {
 		1024
 	);
 
-	var ___stack_high = 11742016;
+	var ___stack_high = 11742080;
 
-	var ___stack_low = 10693440;
+	var ___stack_low = 10693504;
 
 	var ___stack_pointer = new WebAssembly.Global(
 		{ value: 'i32', mutable: true },
-		11742016
+		11742080
 	);
 
 	var PATH = {
@@ -6926,24 +6926,36 @@ export function init(RuntimeName, PHPLoader) {
 	}
 
 	function _fd_close(fd) {
-		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
-			);
-			return -ERRNO_CODES.EBADF;
+		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;
 		}
 
-		const result = _builtin_fd_close(fd);
-		if (result !== 0 || !locking.maybeLockedFds.has(fd)) {
-			_js_wasm_trace('fd_close(%d) result %d', fd, result);
-			return result;
-		}
-		const nativeFilePath = locking.get_native_path_from_vfs_path(vfsPath);
-
 		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;
+			}
+
+			const nativeFilePath =
+				locking.get_native_path_from_vfs_path(vfsPath);
 			PHPLoader.fileLockManager.releaseLocksForProcessFd(
 				PHPLoader.processId,
 				fd,
@@ -6955,7 +6967,7 @@ export function init(RuntimeName, PHPLoader) {
 		} finally {
 			locking.maybeLockedFds.delete(fd);
 		}
-		return result;
+		return fdCloseResult;
 	}
 	_fd_close.sig = 'ii';
 	function _builtin_fd_close(fd) {
@@ -7069,8 +7081,12 @@ export function init(RuntimeName, PHPLoader) {
 			}
 		},
 		get_native_path_from_vfs_path(vfsPath) {
-			// TODO: Should there be a try/catch here?
-			const { node } = FS.lookupPath(vfsPath, {});
+			const { node } = FS.lookupPath(vfsPath, {
+				noent_okay: true,
+			});
+			if (!node) {
+				throw new Error(`No node found for VFS path ${vfsPath}`);
+			}
 			if (node.mount.type === NODEFS) {
 				return NODEFS.realPath(node);
 			} else if (node.mount.type === PROXYFS) {
@@ -7340,10 +7356,9 @@ export function init(RuntimeName, PHPLoader) {
 					return -ERRNO_CODES.EINVAL;
 				}
 
-				const nativeFilePath =
-					locking.get_native_path_from_vfs_path(vfsPath);
-
 				try {
+					const nativeFilePath =
+						locking.get_native_path_from_vfs_path(vfsPath);
 					const conflictingLock =
 						PHPLoader.fileLockManager.findFirstConflictingByteRangeLock(
 							nativeFilePath,
@@ -7477,16 +7492,16 @@ export function init(RuntimeName, PHPLoader) {
 					pid,
 				};
 
-				const nativeFilePath =
-					locking.get_native_path_from_vfs_path(vfsPath);
-				_js_wasm_trace(
-					'fcntl(%d, F_SETLK) %s calling lockFileByteRange for range lock %s',
-					fd,
-					vfsPath,
-					rangeLock
-				);
-
 				try {
+					const nativeFilePath =
+						locking.get_native_path_from_vfs_path(vfsPath);
+					_js_wasm_trace(
+						'fcntl(%d, F_SETLK) %s calling lockFileByteRange for range lock %s',
+						fd,
+						vfsPath,
+						rangeLock
+					);
+
 					const succeeded =
 						PHPLoader.fileLockManager.lockFileByteRange(
 							nativeFilePath,
@@ -17403,8 +17418,9 @@ export function init(RuntimeName, PHPLoader) {
 			return -ERRNO_CODES.EINVAL;
 		}
 
-		const nativeFilePath = locking.get_native_path_from_vfs_path(vfsPath);
 		try {
+			const nativeFilePath =
+				locking.get_native_path_from_vfs_path(vfsPath);
 			const obtainedLock = PHPLoader.fileLockManager.lockWholeFile(
 				nativeFilePath,
 				{
@@ -17740,9 +17756,9 @@ export function init(RuntimeName, PHPLoader) {
 					if (!cp.stdin.closed) {
 						cp.stdin.end();
 					}
-					_free(buffer);
-					_free(iov);
-					_free(pnum);
+					PHPLoader['free'](buffer);
+					PHPLoader['free'](iov);
+					PHPLoader['free'](pnum);
 				}
 
 				// pump() can never alter the result of this function.
@@ -18571,6 +18587,11 @@ export function init(RuntimeName, PHPLoader) {
 		return ret;
 	};
 
+	var setErrNo = (value) => {
+		HEAP32[___errno_location() >> 2] = value;
+		return value;
+	};
+
 	var FS_createPath = FS.createPath;
 
 	var FS_unlink = (path) => FS.unlink(path);
@@ -31587,11 +31608,6 @@ export function init(RuntimeName, PHPLoader) {
 
 	var allocateUTF8 = stringToNewUTF8;
 
-	var setErrNo = (value) => {
-		HEAP32[___errno_location() >> 2] = value;
-		return value;
-	};
-
 	var demangle = (func) => {
 		// If demangle has failed before, stop demangling any further function names
 		// This avoids an infinite recursion with malloc()->abort()->stackTrace()->demangle()->malloc()->...
@@ -32099,13 +32115,13 @@ export function init(RuntimeName, PHPLoader) {
 	// End JS library code
 
 	var ASM_CONSTS = {
-		10534317: ($0) => {
+		10534365: ($0) => {
 			if (!$0) {
 				AL.alcErr = 0xa004;
 				return 1;
 			}
 		},
-		10534365: ($0) => {
+		10534413: ($0) => {
 			if (!AL.currentCtx) {
 				err('alGetProcAddress() called without a valid context');
 				return 1;
@@ -35506,6 +35522,7 @@ export function init(RuntimeName, PHPLoader) {
 	Module['FS_createDevice'] = FS_createDevice;
 	Module['FS_createDataFile'] = FS_createDataFile;
 	Module['FS_createLazyFile'] = FS_createLazyFile;
+	Module['setErrNo'] = setErrNo;
 	Module['PROXYFS'] = PROXYFS;
 
 	function callMain(args = []) {