Fix some error handling

Author: james-pre

package-lock.json

@@ -70,7 +70,7 @@
 		"@types/node": "^22.10.1 <22.13.7",
 		"buffer": "^6.0.3",
 		"eventemitter3": "^5.0.1",
-		"kerium": "^1.3.3",
+		"kerium": "^1.3.4",
 		"memium": "^0.1.10",
 		"readable-stream": "^4.5.2",
 		"utilium": "^2.2.3"

package.json

@@ -28,9 +28,9 @@ export function wrap<const FS, const Prop extends keyof FS & string>(fs: FS, pro
 	if (typeof fn !== 'function') throw new TypeError(`${prop} is not a function`);
 	return function (...args: Parameters<typeof fn>) {
 		try {
-			return fn(...args);
+			return fn.call(fs, ...args);
 		} catch (e: any) {
-			throw setUVMessage(Object.assign(e, { path, dest }));
+			throw setUVMessage(Object.assign(e, { path, dest, syscall: prop.endsWith('Sync') ? prop.slice(0, -4) : prop }));
 		}
 	} as FS[Prop];
 }

src/internal/error.ts

@@ -5,14 +5,14 @@
 	- include/uapi/linux/fs.h (`FS_IOC_*`)
 */
 
-import { Errno, Exception, UV } from 'kerium';
+import { Errno, Exception, setUVMessage, UV } from 'kerium';
 import { sizeof, struct, types as t } from 'memium';
 import { _throw } from 'utilium';
 import { BufferView } from 'utilium/buffer.js';
 import type { V_Context } from '../context.js';
 import { Inode, InodeFlags } from '../internal/inode.js';
 import { normalizePath } from '../utils.js';
-import { fixError, resolveMount } from './shared.js';
+import { resolveMount } from './shared.js';
 
 /*
  * Flags for the fsxattr.xflags field
@@ -202,7 +202,7 @@ export async function ioctl<const Command extends number, const Args extends __i
 				return `/sys/fs/${fs.name}/${fs.uuid}` as _rt;
 		}
 	} catch (e: any) {
-		throw fixError(e, { [resolved]: path });
+		throw setUVMessage(Object.assign(e, { syscall: 'ioctl', path }));
 	}
 
 	throw UV('ENOTSUP', 'ioctl', path);
@@ -267,7 +267,7 @@ export function ioctlSync<const Command extends number, const Args extends __ioc
 				return `/sys/fs/${fs.name}/${fs.uuid}` as _rt;
 		}
 	} catch (e: any) {
-		throw fixError(e, { [resolved]: path });
+		throw setUVMessage(Object.assign(e, { syscall: 'ioctl', path }));
 	}
 
 	throw UV('ENOTSUP', 'ioctl', path);

src/vfs/ioctl.ts

@@ -789,11 +789,13 @@ export async function mkdir(
 	const __create = async (path: string, parent: InodeLike) => {
 		if (checkAccess && !hasAccess(this, parent, constants.W_OK)) throw UV('EACCES', 'mkdir', dirname(path));
 
-		const inode = await fs.mkdir(path, {
-			mode,
-			uid: parent.mode & constants.S_ISUID ? parent.uid : uid,
-			gid: parent.mode & constants.S_ISGID ? parent.gid : gid,
-		});
+		const inode = await fs
+			.mkdir(path, {
+				mode,
+				uid: parent.mode & constants.S_ISUID ? parent.uid : uid,
+				gid: parent.mode & constants.S_ISGID ? parent.gid : gid,
+			})
+			.catch(rethrow({ syscall: 'mkdir', path }));
 		emitChange(this, 'rename', path);
 		return inode;
 	};
@@ -926,7 +928,7 @@ export async function link(this: V_Context, path: fs.PathLike, dest: fs.PathLike
 	// We need to use the VFS here since the link path may be a mount point
 	if (checkAccess && !(await stat.call(this, dirname(dest))).hasAccess(constants.W_OK, this)) throw UV('EACCES', 'link', dirname(dest));
 
-	if (checkAccess && !hasAccess(this, await fs.stat(resolved), constants.R_OK)) throw UV('EACCES', $ex);
+	if (checkAccess && !hasAccess(this, await fs.stat(resolved).catch(rethrow($ex)), constants.R_OK)) throw UV('EACCES', $ex);
 
 	return await fs.link(resolved, dst.path).catch(rethrow($ex));
 }
@@ -1066,7 +1068,12 @@ async function _resolve($: V_Context, path: string, preserveSymlinks?: boolean):
 	const maybePath = join(realDir, base);
 	const resolved = resolveMount(maybePath, $);
 
-	const stats = await resolved.fs.stat(resolved.path).catch(rethrow({ syscall: 'stat', path: maybePath }));
+	const stats = await resolved.fs.stat(resolved.path).catch((e: Exception) => {
+		if (e.code == 'ENOENT') return;
+		throw setUVMessage(Object.assign(e, { syscall: 'stat', path: maybePath }));
+	});
+
+	if (!stats) return { ...resolved, fullPath: path };
 	if (!isSymbolicLink(stats)) {
 		return { ...resolved, fullPath: maybePath, stats };
 	}

src/vfs/promises.ts

@@ -102,31 +102,6 @@ export function resolveMount(path: string, ctx: V_Context): ResolvedMount {
 	throw alert(new Exception(Errno.EIO, 'No file system for ' + path));
 }
 
-/**
- * Reverse maps the paths in text from the mounted FileSystem to the global path
- * @internal @hidden
- */
-export function fixPaths(text: string, paths: Record<string, string>): string {
-	for (const [from, to] of Object.entries(paths)) {
-		text = text?.replaceAll(from, to);
-	}
-	return text;
-}
-
-/**
- * Fix paths in error stacks
- * @internal @hidden
- */
-export function fixError<E extends Exception>(e: E, paths: Record<string, string>): E {
-	try {
-		e.message = fixPaths(e.message, paths);
-	} catch {
-		// `message` is read only
-	}
-	if (e.path) e.path = fixPaths(e.path, paths);
-	return e;
-}
-
 /**
  * @internal @hidden
  */

src/vfs/shared.ts

@@ -17,7 +17,7 @@ import * as constants from './constants.js';
 import { Dir, Dirent } from './dir.js';
 import { deleteFD, fromFD, SyncHandle, toFD } from './file.js';
 import * as flags from './flags.js';
-import { _statfs, fixError, resolveMount } from './shared.js';
+import { _statfs, resolveMount } from './shared.js';
 import { BigIntStats, Stats } from './stats.js';
 import { emitChange } from './watchers.js';
 
@@ -450,16 +450,13 @@ futimesSync satisfies typeof fs.futimesSync;
 export function rmdirSync(this: V_Context, path: fs.PathLike): void {
 	path = normalizePath(path);
 	const { fs, path: resolved } = resolveMount(realpathSync.call(this, path), this);
-	try {
-		const stats = fs.statSync(resolved);
-		if (!isDirectory(stats)) throw UV('ENOTDIR', 'rmdir');
-		if (checkAccess && !hasAccess(this, stats, constants.W_OK)) throw UV('EACCES', 'rmdir');
 
-		fs.rmdirSync(resolved);
-		emitChange(this, 'rename', path.toString());
-	} catch (e: any) {
-		throw setUVMessage(Object.assign(e, { path }));
-	}
+	const stats = wrap(fs, 'statSync', path)(resolved);
+	if (!isDirectory(stats)) throw UV('ENOTDIR', 'rmdir', path);
+	if (checkAccess && !hasAccess(this, stats, constants.W_OK)) throw UV('EACCES', 'rmdir', path);
+
+	wrap(fs, 'rmdirSync', path)(resolved);
+	emitChange(this, 'rename', path.toString());
 }
 rmdirSync satisfies typeof fs.rmdirSync;
 
@@ -480,7 +477,11 @@ export function mkdirSync(this: V_Context, path: fs.PathLike, options?: fs.Mode
 	const __create = (resolved: string, path: string, parent: InodeLike) => {
 		if (checkAccess && !hasAccess(this, parent, constants.W_OK)) throw UV('EACCES', 'mkdir', dirname(path));
 
-		const inode = fs.mkdirSync(resolved, {
+		const inode = wrap(
+			fs,
+			'mkdirSync',
+			path
+		)(resolved, {
 			mode,
 			uid: parent.mode & constants.S_ISUID ? parent.uid : uid,
 			gid: parent.mode & constants.S_ISGID ? parent.gid : gid,
@@ -721,20 +722,20 @@ function _resolveSync($: V_Context, path: string, preserveSymlinks?: boolean): R
 	const maybePath = join(realDir, base);
 	const resolved = resolveMount(maybePath, $);
 
+	let stats: InodeLike | undefined;
 	try {
-		const stats = resolved.fs.statSync(resolved.path);
-		if (!isSymbolicLink(stats)) {
-			return { ...resolved, fullPath: maybePath, stats };
-		}
+		stats = resolved.fs.statSync(resolved.path);
+	} catch (e: any) {
+		if (e.code === 'ENOENT') return { ...resolved, fullPath: path };
+		throw setUVMessage(Object.assign(e, { syscall: 'stat', path: maybePath }));
+	}
 
-		const target = resolve.call($, realDir, readlinkSync.call($, maybePath).toString());
-		return _resolveSync($, target);
-	} catch (e) {
-		if ((e as Exception).code == 'ENOENT') {
-			return { ...resolved, fullPath: path };
-		}
-		throw fixError(e as Exception, { [resolved.path]: maybePath });
+	if (!isSymbolicLink(stats)) {
+		return { ...resolved, fullPath: maybePath, stats };
 	}
+
+	const target = resolve.call($, realDir, readlinkSync.call($, maybePath).toString());
+	return _resolveSync($, target);
 }
 
 export function realpathSync(this: V_Context, path: fs.PathLike, options: fs.BufferEncodingOption): Buffer;

src/vfs/sync.ts

@@ -13,8 +13,8 @@ suite('Error messages', () => {
 
 	test('stat', () => assert.rejects(() => fs.promises.stat(path), missing));
 	test('mkdir', () => assert.rejects(() => fs.promises.mkdir(existingFile, 0o666), existing));
-	test('rmdir', () => assert.rejects(() => fs.promises.rmdir(path), missing));
-	test('rmdir', () => assert.rejects(() => fs.promises.rmdir(existingFile), notDir));
+	test('rmdir (missing)', () => assert.rejects(() => fs.promises.rmdir(path), missing));
+	test('rmdir (existing)', () => assert.rejects(() => fs.promises.rmdir(existingFile), notDir));
 	test('rename', () => assert.rejects(() => fs.promises.rename(path, 'foo'), missing));
 	test('open', () => assert.rejects(() => fs.promises.open(path, 'r'), missing));
 	test('readdir', () => assert.rejects(() => fs.promises.readdir(path), missing));