@zenfs/core 0.9.6 → 0.10.0

package/src/config.ts

@@ -1,14 +1,15 @@
-import { ApiError, ErrorCode } from './ApiError.js';
+import { ErrnoError, Errno } from './error.js';
 import type { Backend, BackendConfiguration } from './backends/backend.js';
 import { checkOptions, isBackend, isBackendConfig } from './backends/backend.js';
 import * as fs from './emulation/index.js';
-import { setCred, type MountMapping } from './emulation/shared.js';
+import { setCred, type MountObject } from './emulation/shared.js';
 import { FileSystem } from './filesystem.js';
+import type { AbsolutePath } from './emulation/path.js';
 
 /**
  * Configuration for a specific mount point
  */
-export type MountConfiguration<FS extends FileSystem = FileSystem, TOptions extends object = object> = FS | BackendConfiguration<FS, TOptions> | Backend<FS, TOptions>;
+export type MountConfiguration<FS extends FileSystem = FileSystem, TOptions extends object = object> = FS | BackendConfiguration<Backend<FS, TOptions>> | Backend<FS, TOptions>;
 
 function isMountConfig(arg: unknown): arg is MountConfiguration {
 	return isBackendConfig(arg) || isBackend(arg) || arg instanceof FileSystem;
@@ -20,11 +21,11 @@ function isMountConfig(arg: unknown): arg is MountConfiguration {
  */
 export async function resolveMountConfig<FS extends FileSystem, TOptions extends object = object>(config: MountConfiguration<FS, TOptions>, _depth = 0): Promise<FS> {
 	if (typeof config !== 'object' || config == null) {
-		throw new ApiError(ErrorCode.EINVAL, 'Invalid options on mount configuration');
+		throw new ErrnoError(Errno.EINVAL, 'Invalid options on mount configuration');
 	}
 
 	if (!isMountConfig(config)) {
-		throw new ApiError(ErrorCode.EINVAL, 'Invalid mount configuration');
+		throw new ErrnoError(Errno.EINVAL, 'Invalid mount configuration');
 	}
 
 	if (config instanceof FileSystem) {
@@ -32,7 +33,7 @@ export async function resolveMountConfig<FS extends FileSystem, TOptions extends
 	}
 
 	if (isBackend(config)) {
-		config = <BackendConfiguration<FS, TOptions>>{ backend: config };
+		config = <BackendConfiguration<Backend<FS, TOptions>>>{ backend: config };
 	}
 
 	for (const [key, value] of Object.entries(config)) {
@@ -45,16 +46,16 @@ export async function resolveMountConfig<FS extends FileSystem, TOptions extends
 		}
 
 		if (_depth > 10) {
-			throw new ApiError(ErrorCode.EINVAL, 'Invalid configuration, too deep and possibly infinite');
+			throw new ErrnoError(Errno.EINVAL, 'Invalid configuration, too deep and possibly infinite');
 		}
 
-		config[key] = await resolveMountConfig(value, ++_depth);
+		(<Record<string, FileSystem>>config)[key] = await resolveMountConfig(value, ++_depth);
 	}
 
 	const { backend } = config;
 
 	if (!(await backend.isAvailable())) {
-		throw new ApiError(ErrorCode.EPERM, 'Backend not available: ' + backend);
+		throw new ErrnoError(Errno.EPERM, 'Backend not available: ' + backend);
 	}
 	checkOptions(backend, config);
 	const mount = backend.create(config);
@@ -63,39 +64,34 @@ export async function resolveMountConfig<FS extends FileSystem, TOptions extends
 }
 
 /**
- *A mapping of mount points to their configurations
+ * Configuration
  */
-export type MappingConfiguration = Partial<{
-	uid: number;
-	gid: number;
-}> &
-	Record<string, FileSystem | BackendConfiguration | Backend>;
-
-/**
- * Configuration for the file systems
- */
-export type Configuration = MountConfiguration | MappingConfiguration;
+export interface Configuration {
+	mounts: Record<AbsolutePath, MountConfiguration>;
+	uid?: number;
+	gid?: number;
+}
 
 /**
  * Creates filesystems with the given configuration, and initializes ZenFS with it.
  * @see Configuration for more info on the configuration object.
  */
-export async function configure(config: Configuration): Promise<void> {
-	const uid = 'uid' in config ? +config.uid || 0 : 0;
-	const gid = 'gid' in config ? +config.gid || 0 : 0;
+export async function configure(config: MountConfiguration | Configuration): Promise<void> {
+	const uid = 'uid' in config ? config.uid || 0 : 0;
+	const gid = 'gid' in config ? config.gid || 0 : 0;
 
 	if (isMountConfig(config)) {
 		// single FS
-		config = { '/': config };
+		config = { mounts: { '/': config } };
 	}
 
-	for (const [point, value] of Object.entries(config)) {
-		if (point == 'uid' || point == 'gid' || typeof value == 'number') {
-			continue;
+	for (const [point, value] of Object.entries(config.mounts) as [AbsolutePath, MountConfiguration][]) {
+		if (!point.startsWith('/')) {
+			throw new ErrnoError(Errno.EINVAL, 'Mount points must have absolute paths');
 		}
-		config[point] = await resolveMountConfig(value);
+		config.mounts[point] = await resolveMountConfig(value);
 	}
 
-	fs.mountMapping(<MountMapping>config);
+	fs.mountObject(config.mounts as MountObject);
 	setCred({ uid, gid, suid: uid, sgid: gid, euid: uid, egid: gid });
 }