Merge branch 'add/file-mounting-to-nodefs' into fix/lookup-path-not-following-symlink-mounts

Author: bgrgicak

packages/php-wasm/compile/php/Dockerfile

@@ -2182,7 +2182,7 @@ RUN set -euxo pipefail; \
 		# stream.stream_ops is sometimes undefined and the check fails. Let's adjust it to
 		# tolerate a null stream.stream_ops value.
 		/root/replace.sh "s/if\s*\(stream\.stream_ops\.poll\)/if (stream.stream_ops?.poll)/g" /root/output/php.js; \
-	# Emscriptend allows only directories to be mounted, but in Playground we support mounting files, directories, and symlinks.
+	# Emscripten allows only directories to be mounted, but in Playground we support mounting files, directories, and symlinks.
 		# For file mounting to work, we need to remove the directory check.
 		/root/replace-across-lines.sh 's/(\s+)if\s*\(\s*!FS\.isDir\(node\.mode\)\s*\)\s*\{\s+throw\s+new\s+FS\.ErrnoError\(54\)\s*;\s+\}(\s+)/$1$2/s' /root/output/php.js; \
 	# Make Emscripten websockets configurable

packages/php-wasm/node/src/lib/node-fs-mount.ts

@@ -1,9 +1,9 @@
-import { type ErrnoError, type MountHandler } from '@php-wasm/universal';
+import { FSHelpers, type MountHandler } from '@php-wasm/universal';
 import { statSync } from 'fs';
 import { basename } from 'path';
 
 export function createNodeFsMountHandler(localPath: string): MountHandler {
-	return async function (php, FS, vfsMountPoint) {
+	return function (php, FS, vfsMountPoint) {
 		/**
 		 * When Emscripten attempt to mount a local path into VFS, it looks up the path
 		 * and adds the local path as a mount to the VFS Node.
@@ -17,47 +17,37 @@ export function createNodeFsMountHandler(localPath: string): MountHandler {
 		 * To work around this, the PHP-wasm compile removes the directory check.
 		 * PHP-WASM source: https://github.com/WordPress/wordpress-playground/blob/5821cee231f452d050fd337b99ad0b26ebda487e/packages/php-wasm/compile/php/Dockerfile#L2148
 		 */
-		let lookup;
-		let unlinkPath: string | undefined;
-		try {
-			lookup = FS.lookupPath(vfsMountPoint);
-		} catch (e) {
-			const err = e as ErrnoError;
-			// FS.lookupPath will throw an error with errno 44 if the path doesn't exist.
-			if (err.errno !== 44) {
-				throw e;
-			}
+		let removeVfsNode = false;
+		if (!FSHelpers.fileExists(FS, vfsMountPoint)) {
 			if (statSync(localPath).isSymbolicLink()) {
 				(FS as any).createNode(
 					FS.lookupPath(vfsMountPoint, { parent: true }).node,
 					basename(localPath),
 					110000
 				);
-				lookup = FS.lookupPath(vfsMountPoint);
 			} else if (statSync(localPath).isFile()) {
 				FS.writeFile(vfsMountPoint, '');
-				unlinkPath = vfsMountPoint;
 			} else if (statSync(localPath).isDirectory()) {
 				FS.mkdirTree(vfsMountPoint);
-				unlinkPath = vfsMountPoint;
 			} else {
 				throw new Error(
 					'Unsupported file type. PHP-wasm supports only symlinks that link to files, directories, or symlinks.'
 				);
 			}
-			lookup = FS.lookupPath(vfsMountPoint);
+			removeVfsNode = true;
 		}
+		const lookup = FS.lookupPath(vfsMountPoint);
 		if (!lookup.node) {
 			throw new Error('Unable to access the mount point in VFS.');
 		}
 		FS.mount(FS.filesystems['NODEFS'], { root: localPath }, vfsMountPoint);
 		return () => {
 			FS!.unmount(vfsMountPoint);
-			if (unlinkPath) {
+			if (removeVfsNode) {
 				if (FS.isDir(lookup.node.mode)) {
-					FS.rmdir(unlinkPath);
+					FS.rmdir(vfsMountPoint);
 				} else {
-					FS.unlink(unlinkPath);
+					FS.unlink(vfsMountPoint);
 				}
 			}
 		};

packages/php-wasm/universal/src/lib/rethrow-file-system-error.ts

@@ -7,12 +7,10 @@
  */
 
 export class ErrnoError extends Error {
-	constructor(errno: number, message?: string, options?: { cause?: any }) {
-		super(message);
+	constructor(errno: number, message?: string, options?: any) {
+		super(message, options);
 		this.name = 'ErrnoError';
 		this.errno = errno;
-		this.message = message ?? '';
-		this.cause = options?.cause;
 	}
 
 	node?: any;