Fix symlink mounting and copying

Author: bgrgicak

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

@@ -1,6 +1,10 @@
-import type { ErrnoError, MountHandler } from '@php-wasm/universal';
+import {
+	FSHelpers,
+	type ErrnoError,
+	type MountHandler,
+} from '@php-wasm/universal';
 import { statSync } from 'fs';
-import { dirname } from 'path';
+import { basename } from 'path';
 
 export function createNodeFsMountHandler(localPath: string): MountHandler {
 	return async function (php, FS, vfsMountPoint) {
@@ -27,9 +31,16 @@ export function createNodeFsMountHandler(localPath: string): MountHandler {
 			if (err.errno !== 44) {
 				throw e;
 			}
-			if (statSync(localPath).isFile()) {
-				unlinkPath = 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;

packages/php-wasm/node/src/test/mounting.spec.ts

@@ -79,31 +79,6 @@ describe('Mounting', () => {
 		}
 	});
 
-	it('Should mount a symlink', async () => {
-		const symlinkPath = path.join(__dirname, 'test-data', 'symlink.txt');
-		const symlinkTarget = path.join(
-			__dirname,
-			'test-data',
-			'long-post-body.txt'
-		);
-		const vfsMountPoint = '/symlink.txt';
-		try {
-			fs.symlinkSync(symlinkTarget, symlinkPath, 'file');
-
-			await php.mount(
-				vfsMountPoint,
-				createNodeFsMountHandler(symlinkPath)
-			);
-
-			expect(php.isFile(vfsMountPoint)).toBe(true);
-			expect(php.readFileAsText(vfsMountPoint)).toEqual(
-				fs.readFileSync(symlinkTarget, 'utf8')
-			);
-		} finally {
-			fs.unlinkSync(symlinkPath);
-		}
-	});
-
 	it('Should unmount a file and remove created node from VFS', async () => {
 		const testFilePath = path.join(
 			__dirname,

packages/php-wasm/node/src/test/symlinks.spec.ts

@@ -1,5 +1,10 @@
 import { loadNodeRuntime } from '..';
-import { PHP, setPhpIniEntries } from '@php-wasm/universal';
+import {
+	__private__dont__use,
+	FSHelpers,
+	PHP,
+	setPhpIniEntries,
+} from '@php-wasm/universal';
 import fs from 'fs';
 import path from 'path';
 import { createNodeFsMountHandler } from '../lib/node-fs-mount';
@@ -60,7 +65,6 @@ testSymlinks.forEach(({ name, sourcePath, symlinkPath }) => {
 				);
 			}
 
-			await php.mkdir('/folder-with-symlinks');
 			await php.mount(
 				'/folder-with-symlinks',
 				createNodeFsMountHandler(
@@ -350,5 +354,56 @@ testSymlinks.forEach(({ name, sourcePath, symlinkPath }) => {
 				}
 			});
 		});
+
+		describe('Test symlink file system operations', () => {
+			const symlinkPath = path.join(
+				__dirname,
+				'test-data',
+				'symlink.txt'
+			);
+			const symlinkTarget = path.join(
+				__dirname,
+				'test-data',
+				'long-post-body.txt'
+			);
+			const vfsMountPoint = '/symlink.txt';
+			beforeEach(async () => {
+				fs.symlinkSync(symlinkTarget, symlinkPath, 'file');
+
+				await php.mount(
+					vfsMountPoint,
+					createNodeFsMountHandler(symlinkPath)
+				);
+			});
+			afterEach(async () => {
+				fs.unlinkSync(symlinkPath);
+			});
+
+			it('Should mount a symlink', async () => {
+				expect(php.isFile(vfsMountPoint)).toBe(true);
+				expect(php.readFileAsText(vfsMountPoint)).toEqual(
+					fs.readFileSync(symlinkTarget, 'utf8')
+				);
+			});
+			it('Should be recognized as a symlink', async () => {
+				expect(php.fileExists(vfsMountPoint)).toBe(true);
+				expect(php.isSymlink(vfsMountPoint)).toBe(true);
+			});
+			it('Should copy a symlink', async () => {
+				const newVfsMountPoint = '/symlink-copy.txt';
+				FSHelpers.copyRecursive(
+					php[__private__dont__use].FS,
+					vfsMountPoint,
+					newVfsMountPoint
+				);
+				expect(php.fileExists(vfsMountPoint)).toBe(true);
+				expect(php.isSymlink(vfsMountPoint)).toBe(true);
+				expect(php.fileExists(newVfsMountPoint)).toBe(true);
+				expect(php.isSymlink(newVfsMountPoint)).toBe(true);
+				expect(php.readlink(newVfsMountPoint)).toBe(
+					php.readlink(vfsMountPoint)
+				);
+			});
+		});
 	});
 });

packages/php-wasm/universal/src/lib/fs-helpers.ts

@@ -301,6 +301,8 @@ export class FSHelpers {
 					joinPaths(toPath, filename)
 				);
 			}
+		} else if (FS.isLink(fromNode.mode)) {
+			FS.symlink(FS.readlink(fromPath), toPath);
 		} else {
 			FS.writeFile(toPath, FS.readFile(fromPath));
 		}