@zenfs/core 1.3.0 → 1.3.2

package/dist/config.js

@@ -93,29 +93,28 @@ export async function configure(configuration) {
     config.checkAccess = !configuration.disableAccessChecks;
     config.updateOnRead = !configuration.disableUpdateOnRead;
     config.syncImmediately = !configuration.onlySyncOnClose;
+    if (configuration.mounts) {
+        const toMount = [];
+        let unmountRoot = false;
+        for (const [point, mountConfig] of Object.entries(configuration.mounts)) {
+            if (!point.startsWith('/')) {
+                throw new ErrnoError(Errno.EINVAL, 'Mount points must have absolute paths');
+            }
+            if (isBackendConfig(mountConfig)) {
+                mountConfig.disableAsyncCache ?? (mountConfig.disableAsyncCache = configuration.disableAsyncCache || false);
+            }
+            if (point == '/')
+                unmountRoot = true;
+            toMount.push([point, await resolveMountConfig(mountConfig)]);
+        }
+        if (unmountRoot)
+            fs.umount('/');
+        await Promise.all(toMount.map(([point, fs]) => mount(point, fs)));
+    }
     if (configuration.addDevices) {
         const devfs = new DeviceFS();
         devfs.addDefaults();
         await devfs.ready();
         await mount('/dev', devfs);
     }
-    if (!configuration.mounts) {
-        return;
-    }
-    const toMount = [];
-    let unmountRoot = false;
-    for (const [point, mountConfig] of Object.entries(configuration.mounts)) {
-        if (!point.startsWith('/')) {
-            throw new ErrnoError(Errno.EINVAL, 'Mount points must have absolute paths');
-        }
-        if (isBackendConfig(mountConfig)) {
-            mountConfig.disableAsyncCache ?? (mountConfig.disableAsyncCache = configuration.disableAsyncCache || false);
-        }
-        if (point == '/')
-            unmountRoot = true;
-        toMount.push([point, await resolveMountConfig(mountConfig)]);
-    }
-    if (unmountRoot)
-        fs.umount('/');
-    await Promise.all(toMount.map(([point, fs]) => mount(point, fs)));
 }

package/dist/index.d.ts

@@ -22,3 +22,10 @@ export * from './emulation/index.js';
 import * as fs from './emulation/index.js';
 export { fs };
 export default fs;
+declare global {
+    /**
+     * Global FS emulation. Do not use unless absolutely needed.
+     * @hidden
+     */
+    var __zenfs__: typeof fs;
+}

package/dist/index.js

@@ -22,3 +22,4 @@ export * from './emulation/index.js';
 import * as fs from './emulation/index.js';
 export { fs };
 export default fs;
+globalThis.__zenfs__ = fs;

package/dist/inode.d.ts

@@ -7,6 +7,7 @@ export declare const rootIno = 0n;
 /**
  * Generic inode definition that can easily be serialized.
  * @internal
+ * @todo [BREAKING]
  */
 export declare class Inode implements StatsLike {
     constructor(buffer?: ArrayBufferLike | ArrayBufferView);

package/dist/inode.js

@@ -47,6 +47,7 @@ export const rootIno = 0n;
 /**
  * Generic inode definition that can easily be serialized.
  * @internal
+ * @todo [BREAKING]
  */
 let Inode = (() => {
     var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l;
@@ -102,8 +103,23 @@ let Inode = (() => {
             this.ino = (__runInitializers(this, _ctimeMs_extraInitializers), __runInitializers(this, _ino_initializers, void 0));
             __runInitializers(this, _ino_extraInitializers);
             if (buffer) {
-                if (buffer.byteLength < sizeof(Inode)) {
-                    throw new RangeError(`Can not create an inode from a buffer less than ${sizeof(Inode)} bytes`);
+                const sz_inode = sizeof(Inode);
+                const oldSize = sz_inode - sizeof('uint64');
+                if (buffer.byteLength < oldSize) {
+                    throw new RangeError(`Can not create an inode from a buffer less than ${oldSize} bytes`);
+                }
+                // Expand the buffer so it is the right size
+                if (buffer.byteLength < sz_inode) {
+                    const newBuffer = new Uint8Array(sz_inode);
+                    // Fill the new buffer with current data
+                    newBuffer.set(new Uint8Array(ArrayBuffer.isView(buffer) ? buffer.buffer : buffer));
+                    /* 	Add a random ino.
+                        This will be different from the actual one,
+                        but `ino` isn't used anywhere so it should be fine.
+                    */
+                    const randomIno = crypto.getRandomValues(new Uint32Array(2));
+                    newBuffer.set(randomIno, sz_inode - 2);
+                    buffer = newBuffer;
                 }
                 deserialize(this, buffer);
                 return;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@zenfs/core",
-	"version": "1.3.0",
+	"version": "1.3.2",
 	"description": "A filesystem, anywhere",
 	"funding": {
 		"type": "individual",

package/src/config.ts

@@ -196,34 +196,32 @@ export async function configure<T extends ConfigMounts>(configuration: Partial<C
 	config.updateOnRead = !configuration.disableUpdateOnRead;
 	config.syncImmediately = !configuration.onlySyncOnClose;
 
-	if (configuration.addDevices) {
-		const devfs = new DeviceFS();
-		devfs.addDefaults();
-		await devfs.ready();
-		await mount('/dev', devfs);
-	}
+	if (configuration.mounts) {
+		const toMount: [string, FileSystem][] = [];
+		let unmountRoot = false;
 
-	if (!configuration.mounts) {
-		return;
-	}
+		for (const [point, mountConfig] of Object.entries(configuration.mounts)) {
+			if (!point.startsWith('/')) {
+				throw new ErrnoError(Errno.EINVAL, 'Mount points must have absolute paths');
+			}
 
-	const toMount: [string, FileSystem][] = [];
-	let unmountRoot = false;
+			if (isBackendConfig(mountConfig)) {
+				mountConfig.disableAsyncCache ??= configuration.disableAsyncCache || false;
+			}
 
-	for (const [point, mountConfig] of Object.entries(configuration.mounts)) {
-		if (!point.startsWith('/')) {
-			throw new ErrnoError(Errno.EINVAL, 'Mount points must have absolute paths');
+			if (point == '/') unmountRoot = true;
+			toMount.push([point, await resolveMountConfig(mountConfig)]);
 		}
 
-		if (isBackendConfig(mountConfig)) {
-			mountConfig.disableAsyncCache ??= configuration.disableAsyncCache || false;
-		}
+		if (unmountRoot) fs.umount('/');
 
-		if (point == '/') unmountRoot = true;
-		toMount.push([point, await resolveMountConfig(mountConfig)]);
+		await Promise.all(toMount.map(([point, fs]) => mount(point, fs)));
 	}
 
-	if (unmountRoot) fs.umount('/');
-
-	await Promise.all(toMount.map(([point, fs]) => mount(point, fs)));
+	if (configuration.addDevices) {
+		const devfs = new DeviceFS();
+		devfs.addDefaults();
+		await devfs.ready();
+		await mount('/dev', devfs);
+	}
 }

package/src/index.ts

@@ -23,3 +23,13 @@ export * from './emulation/index.js';
 import * as fs from './emulation/index.js';
 export { fs };
 export default fs;
+
+declare global {
+	/**
+	 * Global FS emulation. Do not use unless absolutely needed.
+	 * @hidden
+	 */
+	// eslint-disable-next-line no-var
+	var __zenfs__: typeof fs;
+}
+globalThis.__zenfs__ = fs;

package/src/inode.ts

@@ -11,13 +11,30 @@ export const rootIno = 0n;
 /**
  * Generic inode definition that can easily be serialized.
  * @internal
+ * @todo [BREAKING]
  */
 @struct()
 export class Inode implements StatsLike {
 	public constructor(buffer?: ArrayBufferLike | ArrayBufferView) {
 		if (buffer) {
-			if (buffer.byteLength < sizeof(Inode)) {
-				throw new RangeError(`Can not create an inode from a buffer less than ${sizeof(Inode)} bytes`);
+			const sz_inode = sizeof(Inode);
+			const oldSize = sz_inode - sizeof('uint64');
+			if (buffer.byteLength < oldSize) {
+				throw new RangeError(`Can not create an inode from a buffer less than ${oldSize} bytes`);
+			}
+
+			// Expand the buffer so it is the right size
+			if (buffer.byteLength < sz_inode) {
+				const newBuffer = new Uint8Array(sz_inode);
+				// Fill the new buffer with current data
+				newBuffer.set(new Uint8Array(ArrayBuffer.isView(buffer) ? buffer.buffer : buffer));
+				/* 	Add a random ino. 
+					This will be different from the actual one,
+					but `ino` isn't used anywhere so it should be fine.
+				*/
+				const randomIno = crypto.getRandomValues(new Uint32Array(2));
+				newBuffer.set(randomIno, sz_inode - 2);
+				buffer = newBuffer;
 			}
 
 			deserialize(this, buffer);