@componentor/fs 2.0.7 → 2.0.9

package/README.md

@@ -448,14 +448,12 @@ Another tab or operation has the file open. The library uses `navigator.locks` t
 
 ### v2.0.7 (2025)
 
-**Smart Handle Caching with `readwrite-unsafe`:**
+**High-Performance Handle Caching with `readwrite-unsafe`:**
 - Uses `readwrite-unsafe` mode (Chrome 121+) - no exclusive locks
+- Zero per-operation overhead: cache lookup is a single Map.get()
 - Browser extensions can access files while handles are cached
-- Access-time based cleanup: handles released after 30s of inactivity
-- Accessing a cached handle renews its timeout (stays cached during active use)
-- Active operation protection: handles in use are never released
 - LRU eviction when cache exceeds 100 handles
-- Falls back to 100ms debounced release on older browsers
+- Falls back to 100ms debounced release on older browsers (handles block)
 
 ### v2.0.2 (2025)
 

package/dist/index.cjs

@@ -434,111 +434,75 @@ const dirCache = new Map();
 // Uses readwrite-unsafe mode when available (no exclusive lock, allows external access)
 // Falls back to readwrite with debounced release for older browsers
 const syncHandleCache = new Map();
-const syncHandleLastAccess = new Map();
-const syncHandleActiveOps = new Map(); // Track active operations per handle
 const MAX_HANDLES = 100;
 
 // Track if readwrite-unsafe mode is supported (detected on first use)
 let unsafeModeSupported = null;
 
-// Handle release timing:
-// - readwrite-unsafe: 30s idle timeout (no blocking, just memory management)
-// - readwrite (fallback): 100ms debounce (need to release locks quickly)
+// Debug tracing - set via 'setDebug' message
+let debugTrace = false;
+function trace(...args) {
+  if (debugTrace) console.log('[OPFS-T2]', ...args);
+}
+
+// Handle release timing
+// - Legacy mode (readwrite): 100ms delay (handles block, release ASAP)
+// - Unsafe mode (readwrite-unsafe): 500ms delay (handles don't block each other,
+//   but DO block external tools using default mode like OPFS Explorer)
 let releaseTimer = null;
-const UNSAFE_IDLE_TIMEOUT = 30000;
 const LEGACY_RELEASE_DELAY = 100;
+const UNSAFE_RELEASE_DELAY = 500;
 
-// Track active operations to prevent releasing handles in use
-function beginHandleOp(path) {
-  syncHandleActiveOps.set(path, (syncHandleActiveOps.get(path) || 0) + 1);
-}
+function scheduleHandleRelease() {
+  if (releaseTimer) return; // Already scheduled
 
-function endHandleOp(path) {
-  const count = syncHandleActiveOps.get(path) || 0;
-  if (count <= 1) {
-    syncHandleActiveOps.delete(path);
-  } else {
-    syncHandleActiveOps.set(path, count - 1);
-  }
-}
+  const delay = unsafeModeSupported ? UNSAFE_RELEASE_DELAY : LEGACY_RELEASE_DELAY;
 
-function isHandleInUse(path) {
-  return (syncHandleActiveOps.get(path) || 0) > 0;
-}
-
-function scheduleHandleRelease() {
-  if (releaseTimer) {
-    clearTimeout(releaseTimer);
-  }
+  releaseTimer = setTimeout(() => {
+    releaseTimer = null;
+    const count = syncHandleCache.size;
+    if (count === 0) return;
 
-  if (unsafeModeSupported) {
-    // readwrite-unsafe: clean up handles idle for 30s
-    releaseTimer = setTimeout(() => {
-      releaseTimer = null;
-      const now = Date.now();
-      for (const [path, lastAccess] of syncHandleLastAccess) {
-        // Skip handles that are currently in use
-        if (isHandleInUse(path)) continue;
-        if (now - lastAccess >= UNSAFE_IDLE_TIMEOUT) {
-          const h = syncHandleCache.get(path);
-          if (h) { try { h.flush(); h.close(); } catch {} }
-          syncHandleCache.delete(path);
-          syncHandleLastAccess.delete(path);
-        }
-      }
-      // Reschedule if there are still handles
-      if (syncHandleCache.size > 0) {
-        scheduleHandleRelease();
-      }
-    }, UNSAFE_IDLE_TIMEOUT);
-  } else {
-    // Legacy readwrite: release all handles after 100ms idle
-    releaseTimer = setTimeout(() => {
-      releaseTimer = null;
-      if (syncHandleCache.size > 0) {
-        for (const [path, h] of syncHandleCache) {
-          // Skip handles that are currently in use
-          if (isHandleInUse(path)) continue;
-          try { h.flush(); h.close(); } catch {}
-          syncHandleCache.delete(path);
-          syncHandleLastAccess.delete(path);
-        }
-      }
-    }, LEGACY_RELEASE_DELAY);
-  }
+    for (const h of syncHandleCache.values()) {
+      try { h.flush(); h.close(); } catch {}
+    }
+    syncHandleCache.clear();
+    trace('Released ' + count + ' handles (' + (unsafeModeSupported ? 'unsafe' : 'legacy') + ' mode, ' + delay + 'ms delay)');
+  }, delay);
 }
 
 async function getSyncHandle(filePath, create) {
   const cached = syncHandleCache.get(filePath);
   if (cached) {
-    // Renew last access time
-    syncHandleLastAccess.set(filePath, Date.now());
+    trace('Handle cache HIT: ' + filePath);
     return cached;
   }
 
   // Evict oldest handles if cache is full
   if (syncHandleCache.size >= MAX_HANDLES) {
     const keys = Array.from(syncHandleCache.keys()).slice(0, 10);
+    trace('LRU evicting ' + keys.length + ' handles');
     for (const key of keys) {
       const h = syncHandleCache.get(key);
-      if (h) { try { h.close(); } catch {} syncHandleCache.delete(key); syncHandleLastAccess.delete(key); }
+      if (h) { try { h.close(); } catch {} syncHandleCache.delete(key); }
     }
   }
 
   const fh = await getFileHandle(filePath, create);
 
   // Try readwrite-unsafe mode first (no exclusive lock, Chrome 121+)
-  // Falls back to readwrite if not supported
   let access;
   if (unsafeModeSupported === null) {
     // First time - detect support
     try {
       access = await fh.createSyncAccessHandle({ mode: 'readwrite-unsafe' });
       unsafeModeSupported = true;
+      trace('readwrite-unsafe mode SUPPORTED - handles won\\'t block');
     } catch {
       // Not supported, use default mode
       access = await fh.createSyncAccessHandle();
       unsafeModeSupported = false;
+      trace('readwrite-unsafe mode NOT supported - using legacy mode');
     }
   } else if (unsafeModeSupported) {
     access = await fh.createSyncAccessHandle({ mode: 'readwrite-unsafe' });
@@ -547,13 +511,17 @@ async function getSyncHandle(filePath, create) {
   }
 
   syncHandleCache.set(filePath, access);
-  syncHandleLastAccess.set(filePath, Date.now());
+  trace('Handle ACQUIRED: ' + filePath + ' (cache size: ' + syncHandleCache.size + ')');
   return access;
 }
 
 function closeSyncHandle(filePath) {
   const h = syncHandleCache.get(filePath);
-  if (h) { try { h.close(); } catch {} syncHandleCache.delete(filePath); syncHandleLastAccess.delete(filePath); }
+  if (h) {
+    try { h.close(); } catch {}
+    syncHandleCache.delete(filePath);
+    trace('Handle RELEASED: ' + filePath);
+  }
 }
 
 function closeHandlesUnder(prefix) {
@@ -561,7 +529,6 @@ function closeHandlesUnder(prefix) {
     if (p === prefix || p.startsWith(prefix + '/')) {
       try { h.close(); } catch {}
       syncHandleCache.delete(p);
-      syncHandleLastAccess.delete(p);
     }
   }
 }
@@ -636,17 +603,12 @@ async function getParentAndName(filePath) {
 
 async function handleRead(filePath, payload) {
   const access = await getSyncHandle(filePath, false);
-  beginHandleOp(filePath);
-  try {
-    const size = access.getSize();
-    const offset = payload?.offset || 0;
-    const len = payload?.len || (size - offset);
-    const buf = new Uint8Array(len);
-    const bytesRead = access.read(buf, { at: offset });
-    return { data: buf.slice(0, bytesRead) };
-  } finally {
-    endHandleOp(filePath);
-  }
+  const size = access.getSize();
+  const offset = payload?.offset || 0;
+  const len = payload?.len || (size - offset);
+  const buf = new Uint8Array(len);
+  const bytesRead = access.read(buf, { at: offset });
+  return { data: buf.slice(0, bytesRead) };
 }
 
 // Non-blocking read using getFile() - does NOT lock the file
@@ -682,57 +644,39 @@ function handleReleaseHandle(filePath) {
 
 // Force release ALL file handles - use before HMR notifications
 function handleReleaseAllHandles() {
-  for (const [p, h] of syncHandleCache) {
+  for (const h of syncHandleCache.values()) {
     try { h.close(); } catch {}
   }
   syncHandleCache.clear();
-  syncHandleLastAccess.clear();
-  syncHandleActiveOps.clear();
   return { success: true };
 }
 
 async function handleWrite(filePath, payload) {
   const access = await getSyncHandle(filePath, true);
-  beginHandleOp(filePath);
-  try {
-    if (payload?.data) {
-      const offset = payload.offset ?? 0;
-      if (offset === 0) access.truncate(0);
-      access.write(payload.data, { at: offset });
-      // Only flush if explicitly requested (default: true for safety)
-      if (payload?.flush !== false) access.flush();
-    }
-    return { success: true };
-  } finally {
-    endHandleOp(filePath);
+  if (payload?.data) {
+    const offset = payload.offset ?? 0;
+    if (offset === 0) access.truncate(0);
+    access.write(payload.data, { at: offset });
+    if (payload?.flush !== false) access.flush();
   }
+  return { success: true };
 }
 
 async function handleAppend(filePath, payload) {
   const access = await getSyncHandle(filePath, true);
-  beginHandleOp(filePath);
-  try {
-    if (payload?.data) {
-      const size = access.getSize();
-      access.write(payload.data, { at: size });
-      if (payload?.flush !== false) access.flush();
-    }
-    return { success: true };
-  } finally {
-    endHandleOp(filePath);
+  if (payload?.data) {
+    const size = access.getSize();
+    access.write(payload.data, { at: size });
+    if (payload?.flush !== false) access.flush();
   }
+  return { success: true };
 }
 
 async function handleTruncate(filePath, payload) {
   const access = await getSyncHandle(filePath, false);
-  beginHandleOp(filePath);
-  try {
-    access.truncate(payload?.len ?? 0);
-    access.flush();
-    return { success: true };
-  } finally {
-    endHandleOp(filePath);
-  }
+  access.truncate(payload?.len ?? 0);
+  access.flush();
+  return { success: true };
 }
 
 async function handleStat(filePath) {
@@ -901,18 +845,14 @@ function handleFlush() {
 }
 
 function handlePurge() {
-  // Cancel any pending release timer
   if (releaseTimer) {
     clearTimeout(releaseTimer);
     releaseTimer = null;
   }
-  // Flush and close all cached sync handles
-  for (const [, handle] of syncHandleCache) {
+  for (const handle of syncHandleCache.values()) {
     try { handle.flush(); handle.close(); } catch {}
   }
   syncHandleCache.clear();
-  syncHandleLastAccess.clear();
-  syncHandleActiveOps.clear();
   dirCache.clear();
   cachedRoot = null;
   return { success: true };
@@ -938,6 +878,10 @@ async function processMessage(msg) {
     case 'purge': return handlePurge();
     case 'releaseHandle': return handleReleaseHandle(path);
     case 'releaseAllHandles': return handleReleaseAllHandles();
+    case 'setDebug':
+      debugTrace = !!payload?.enabled;
+      trace('Debug tracing ' + (debugTrace ? 'ENABLED' : 'DISABLED') + ', unsafeMode: ' + unsafeModeSupported);
+      return { success: true, debugTrace, unsafeModeSupported, cacheSize: syncHandleCache.size };
     default: throw new Error('Unknown operation: ' + type);
   }
 }
@@ -1006,22 +950,27 @@ async function handleMessage(msg) {
   }
 }
 
-// Process queued messages after ready
-function processQueue() {
-  while (messageQueue.length > 0) {
+// Process queued messages with concurrency limit
+// Allows multiple operations to run in parallel but prevents overwhelming the worker
+const MAX_CONCURRENT = 8;
+let activeOperations = 0;
+
+async function processQueue() {
+  while (messageQueue.length > 0 && activeOperations < MAX_CONCURRENT) {
     const msg = messageQueue.shift();
-    handleMessage(msg);
+    activeOperations++;
+    handleMessage(msg).finally(() => {
+      activeOperations--;
+      processQueue(); // Process next queued message
+    });
   }
 }
 
-// Handle messages directly - no serialization needed because:
-// - Tier 2: Client awaits response before sending next message
-// - Each OPFSFileSystem instance has its own worker
+// Queue messages and process with controlled concurrency
 self.onmessage = (event) => {
+  messageQueue.push(event.data);
   if (isReady) {
-    handleMessage(event.data);
-  } else {
-    messageQueue.push(event.data);
+    processQueue();
   }
 };
 
@@ -1794,6 +1743,24 @@ var OPFSFileSystem = class _OPFSFileSystem {
     this.syncCall("purge", "/");
     this.statCache.clear();
   }
+  /**
+   * Enable or disable debug tracing for handle operations.
+   * When enabled, logs handle cache hits, acquisitions, releases, and mode information.
+   * @param enabled - Whether to enable debug tracing
+   * @returns Debug state information including unsafeModeSupported and cache size
+   */
+  setDebugSync(enabled) {
+    return this.syncCall("setDebug", "/", { enabled });
+  }
+  /**
+   * Enable or disable debug tracing for handle operations (async version).
+   * When enabled, logs handle cache hits, acquisitions, releases, and mode information.
+   * @param enabled - Whether to enable debug tracing
+   * @returns Debug state information including unsafeModeSupported and cache size
+   */
+  async setDebug(enabled) {
+    return this.asyncCall("setDebug", "/", { enabled });
+  }
   accessSync(filePath, _mode) {
     const exists = this.existsSync(filePath);
     if (!exists) {