@componentor/fs 1.2.5 → 1.2.7

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@componentor/fs",
-  "version": "1.2.5",
+  "version": "1.2.7",
   "description": "A blazing-fast, Node.js-compatible filesystem for the browser using OPFS",
   "type": "module",
   "main": "./dist/index.js",

package/src/handle-manager.ts

@@ -17,68 +17,56 @@ const FILE_HANDLE_POOL_SIZE = 50
 const DIR_CACHE_MAX_SIZE = 200
 
 /**
- * Manages file-level locks to prevent concurrent sync access handle creation.
- * OPFS only allows one sync access handle per file at a time.
+ * Simple in-memory lock for preventing concurrent sync access handle creation
+ * within the same JavaScript context. This is needed because sync access handles
+ * are exclusive per file - only one can exist at a time.
+ *
+ * Optimized for the uncontended case (no Promise creation when lock is free).
  */
-export class FileLockManager {
-  private locks: Map<string, Promise<void>> = new Map()
-  private lockResolvers: Map<string, () => void> = new Map()
-  private waitQueues: Map<string, Array<() => void>> = new Map()
+class FileLock {
+  private active = new Set<string>()
+  private queues = new Map<string, Array<() => void>>()
 
-  /**
-   * Acquire an exclusive lock on a file path.
-   * If the file is already locked, waits until it's released.
-   * Returns a release function that MUST be called when done.
-   */
   async acquire(path: string): Promise<() => void> {
-    const normalizedPath = normalize(path)
-
-    // If file is currently locked, wait for it
-    while (this.locks.has(normalizedPath)) {
-      await this.locks.get(normalizedPath)
+    if (!this.active.has(path)) {
+      // Fast path: no contention, just mark as active
+      this.active.add(path)
+      return this.createRelease(path)
     }
 
-    // Create new lock
-    let resolve: () => void
-    const lockPromise = new Promise<void>(r => {
-      resolve = r
+    // Slow path: wait in queue
+    await new Promise<void>(resolve => {
+      let queue = this.queues.get(path)
+      if (!queue) {
+        queue = []
+        this.queues.set(path, queue)
+      }
+      queue.push(resolve)
     })
 
-    this.locks.set(normalizedPath, lockPromise)
-    this.lockResolvers.set(normalizedPath, resolve!)
-
-    // Return release function
-    return () => {
-      const resolver = this.lockResolvers.get(normalizedPath)
-      this.locks.delete(normalizedPath)
-      this.lockResolvers.delete(normalizedPath)
-      if (resolver) resolver()
-    }
-  }
-
-  /**
-   * Check if a file is currently locked
-   */
-  isLocked(path: string): boolean {
-    return this.locks.has(normalize(path))
+    return this.createRelease(path)
   }
 
-  /**
-   * Clear all locks (use with caution, mainly for cleanup)
-   */
-  clearAll(): void {
-    // Resolve all pending locks
-    for (const resolver of this.lockResolvers.values()) {
-      resolver()
+  private createRelease(path: string): () => void {
+    return () => {
+      const queue = this.queues.get(path)
+      if (queue && queue.length > 0) {
+        // Pass ownership to next waiter
+        const next = queue.shift()!
+        if (queue.length === 0) {
+          this.queues.delete(path)
+        }
+        next()
+      } else {
+        // No waiters, release the lock
+        this.active.delete(path)
+      }
     }
-    this.locks.clear()
-    this.lockResolvers.clear()
-    this.waitQueues.clear()
   }
 }
 
-// Global file lock manager instance
-export const fileLockManager = new FileLockManager()
+/** Global file lock instance for sync access handle serialization */
+export const fileLock = new FileLock()
 
 /**
  * Manages OPFS handles with caching for improved performance

package/src/index.ts

@@ -24,7 +24,7 @@ import type {
 import { constants, flagsToString } from './constants.js'
 import { createENOENT, createEEXIST, createEACCES, createEISDIR, wrapError } from './errors.js'
 import { normalize, dirname, basename, join, isRoot, segments } from './path-utils.js'
-import { HandleManager, fileLockManager } from './handle-manager.js'
+import { HandleManager } from './handle-manager.js'
 import { SymlinkManager } from './symlink-manager.js'
 import { PackedStorage } from './packed-storage.js'
 import { createFileHandle } from './file-handle.js'
@@ -187,18 +187,13 @@ export default class OPFS {
         let buffer: Uint8Array
 
         if (this.useSync) {
-          const releaseLock = await fileLockManager.acquire(resolvedPath)
+          const access = await fileHandle.createSyncAccessHandle()
           try {
-            const access = await fileHandle.createSyncAccessHandle()
-            try {
-              const size = access.getSize()
-              buffer = new Uint8Array(size)
-              access.read(buffer)
-            } finally {
-              access.close()
-            }
+            const size = access.getSize()
+            buffer = new Uint8Array(size)
+            access.read(buffer)
           } finally {
-            releaseLock()
+            access.close()
           }
         } else {
           const file = await fileHandle.getFile()
@@ -277,18 +272,13 @@ export default class OPFS {
 
               let buffer: Uint8Array
               if (this.useSync) {
-                const releaseLock = await fileLockManager.acquire(resolvedPath)
+                const access = await fileHandle.createSyncAccessHandle()
                 try {
-                  const access = await fileHandle.createSyncAccessHandle()
-                  try {
-                    const size = access.getSize()
-                    buffer = new Uint8Array(size)
-                    access.read(buffer)
-                  } finally {
-                    access.close()
-                  }
+                  const size = access.getSize()
+                  buffer = new Uint8Array(size)
+                  access.read(buffer)
                 } finally {
-                  releaseLock()
+                  access.close()
                 }
               } else {
                 const file = await fileHandle.getFile()
@@ -326,18 +316,13 @@ export default class OPFS {
       const buffer = typeof data === 'string' ? new TextEncoder().encode(data) : data
 
       if (this.useSync) {
-        const releaseLock = await fileLockManager.acquire(resolvedPath)
+        const access = await fileHandle!.createSyncAccessHandle()
         try {
-          const access = await fileHandle!.createSyncAccessHandle()
-          try {
-            // Set exact size (more efficient than truncate(0) + write)
-            access.truncate(buffer.length)
-            access.write(buffer, { at: 0 })
-          } finally {
-            access.close()
-          }
+          // Set exact size (more efficient than truncate(0) + write)
+          access.truncate(buffer.length)
+          access.write(buffer, { at: 0 })
         } finally {
-          releaseLock()
+          access.close()
         }
       } else {
         const writable = await fileHandle!.createWritable()
@@ -1060,16 +1045,11 @@ export default class OPFS {
       if (!fileHandle) throw createENOENT(path)
 
       if (this.useSync) {
-        const releaseLock = await fileLockManager.acquire(resolvedPath)
+        const access = await fileHandle.createSyncAccessHandle()
         try {
-          const access = await fileHandle.createSyncAccessHandle()
-          try {
-            access.truncate(len)
-          } finally {
-            access.close()
-          }
+          access.truncate(len)
         } finally {
-          releaseLock()
+          access.close()
         }
       } else {
         const file = await fileHandle.getFile()

package/src/packed-storage.ts

@@ -15,7 +15,7 @@
  */
 
 import type { HandleManager } from './handle-manager.js'
-import { fileLockManager } from './handle-manager.js'
+import { fileLock } from './handle-manager.js'
 import { createECORRUPTED } from './errors.js'
 
 // ============ Compression ============
@@ -174,7 +174,7 @@ export class PackedStorage {
       }
 
       if (this.useSync) {
-        const releaseLock = await fileLockManager.acquire(PACK_FILE)
+        const release = await fileLock.acquire(PACK_FILE)
         try {
           const access = await fileHandle.createSyncAccessHandle()
           try {
@@ -210,7 +210,7 @@ export class PackedStorage {
             access.close()
           }
         } finally {
-          releaseLock()
+          release()
         }
       } else {
         const file = await fileHandle.getFile()
@@ -274,7 +274,7 @@ export class PackedStorage {
     let buffer: Uint8Array
 
     if (this.useSync) {
-      const releaseLock = await fileLockManager.acquire(PACK_FILE)
+      const release = await fileLock.acquire(PACK_FILE)
       try {
         const access = await fileHandle.createSyncAccessHandle()
         try {
@@ -284,7 +284,7 @@ export class PackedStorage {
           access.close()
         }
       } finally {
-        releaseLock()
+        release()
       }
     } else {
       const file = await fileHandle.getFile()
@@ -336,7 +336,7 @@ export class PackedStorage {
     const decompressPromises: Array<{ path: string; promise: Promise<Uint8Array> }> = []
 
     if (this.useSync) {
-      const releaseLock = await fileLockManager.acquire(PACK_FILE)
+      const release = await fileLock.acquire(PACK_FILE)
       try {
         const access = await fileHandle.createSyncAccessHandle()
         try {
@@ -355,7 +355,7 @@ export class PackedStorage {
           access.close()
         }
       } finally {
-        releaseLock()
+        release()
       }
     } else {
       const file = await fileHandle.getFile()
@@ -475,7 +475,7 @@ export class PackedStorage {
     if (!fileHandle) return
 
     if (this.useSync) {
-      const releaseLock = await fileLockManager.acquire(PACK_FILE)
+      const release = await fileLock.acquire(PACK_FILE)
       try {
         const access = await fileHandle.createSyncAccessHandle()
         try {
@@ -485,7 +485,7 @@ export class PackedStorage {
           access.close()
         }
       } finally {
-        releaseLock()
+        release()
       }
     } else {
       const writable = await fileHandle.createWritable()
@@ -512,7 +512,7 @@ export class PackedStorage {
     const newIndexBuf = encoder.encode(JSON.stringify(index))
 
     if (this.useSync) {
-      const releaseLock = await fileLockManager.acquire(PACK_FILE)
+      const release = await fileLock.acquire(PACK_FILE)
       try {
         const access = await fileHandle.createSyncAccessHandle()
         try {
@@ -558,7 +558,7 @@ export class PackedStorage {
           access.close()
         }
       } finally {
-        releaseLock()
+        release()
       }
     } else {
       // For non-sync, rewrite the whole file

package/src/symlink-manager.ts

@@ -1,6 +1,6 @@
 import type { SymlinkCache, SymlinkDefinition } from './types.js'
 import type { HandleManager } from './handle-manager.js'
-import { fileLockManager } from './handle-manager.js'
+import { fileLock } from './handle-manager.js'
 import { normalize } from './path-utils.js'
 import { createELOOP, createEINVAL, createEEXIST } from './errors.js'
 
@@ -102,7 +102,7 @@ export class SymlinkManager {
     const buffer = new TextEncoder().encode(data)
 
     if (this.useSync) {
-      const releaseLock = await fileLockManager.acquire(SYMLINK_FILE)
+      const release = await fileLock.acquire(SYMLINK_FILE)
       try {
         const access = await fileHandle.createSyncAccessHandle()
         try {
@@ -115,7 +115,7 @@ export class SymlinkManager {
           access.close()
         }
       } finally {
-        releaseLock()
+        release()
       }
     } else {
       const writable = await fileHandle.createWritable()