react-native-nitro-storage 0.4.0 → 0.4.3

package/lib/module/index.web.js

@@ -25,10 +25,12 @@ const webScopeKeyIndex = new Map([[StorageScope.Disk, new Set()], [StorageScope.
 const hydratedWebScopeKeyIndex = new Set();
 const pendingSecureWrites = new Map();
 let secureFlushScheduled = false;
+let secureDefaultAccessControl = AccessControl.WhenUnlocked;
 const SECURE_WEB_PREFIX = "__secure_";
 const BIOMETRIC_WEB_PREFIX = "__bio_";
 let hasWarnedAboutWebBiometricFallback = false;
 let hasWebStorageEventSubscription = false;
+let webStorageSubscriberCount = 0;
 let metricsObserver;
 const metricsCounters = new Map();
 function recordMetric(operation, scope, durationMs, keysCount = 1) {
@@ -52,6 +54,9 @@ function recordMetric(operation, scope, durationMs, keysCount = 1) {
   });
 }
 function measureOperation(operation, scope, fn, keysCount = 1) {
+  if (!metricsObserver) {
+    return fn();
+  }
   const start = Date.now();
   try {
     return fn();
@@ -80,6 +85,8 @@ function createLocalStorageWebSecureBackend() {
   };
 }
 let webSecureStorageBackend = createLocalStorageWebSecureBackend();
+let cachedSecureBrowserStorage;
+let cachedSecureBackendRef;
 function getBrowserStorage(scope) {
   if (scope === StorageScope.Disk) {
     return globalThis.localStorage;
@@ -88,16 +95,21 @@ function getBrowserStorage(scope) {
     if (!webSecureStorageBackend) {
       return undefined;
     }
-    return {
-      setItem: (key, value) => webSecureStorageBackend?.setItem(key, value),
-      getItem: key => webSecureStorageBackend?.getItem(key) ?? null,
-      removeItem: key => webSecureStorageBackend?.removeItem(key),
-      clear: () => webSecureStorageBackend?.clear(),
-      key: index => webSecureStorageBackend?.getAllKeys()[index] ?? null,
+    if (cachedSecureBackendRef === webSecureStorageBackend && cachedSecureBrowserStorage) {
+      return cachedSecureBrowserStorage;
+    }
+    cachedSecureBackendRef = webSecureStorageBackend;
+    cachedSecureBrowserStorage = {
+      setItem: (key, value) => webSecureStorageBackend.setItem(key, value),
+      getItem: key => webSecureStorageBackend.getItem(key) ?? null,
+      removeItem: key => webSecureStorageBackend.removeItem(key),
+      clear: () => webSecureStorageBackend.clear(),
+      key: index => webSecureStorageBackend.getAllKeys()[index] ?? null,
       get length() {
-        return webSecureStorageBackend?.getAllKeys().length ?? 0;
+        return webSecureStorageBackend.getAllKeys().length;
       }
     };
+    return cachedSecureBrowserStorage;
   }
   return undefined;
 }
@@ -197,14 +209,18 @@ function handleWebStorageEvent(event) {
   notifyKeyListeners(getScopedListeners(StorageScope.Disk), key);
 }
 function ensureWebStorageEventSubscription() {
-  if (hasWebStorageEventSubscription) {
-    return;
+  webStorageSubscriberCount += 1;
+  if (webStorageSubscriberCount === 1 && typeof window !== "undefined" && typeof window.addEventListener === "function") {
+    window.addEventListener("storage", handleWebStorageEvent);
+    hasWebStorageEventSubscription = true;
   }
-  if (typeof window === "undefined" || typeof window.addEventListener !== "function") {
-    return;
+}
+function maybeCleanupWebStorageSubscription() {
+  webStorageSubscriberCount = Math.max(0, webStorageSubscriberCount - 1);
+  if (webStorageSubscriberCount === 0 && hasWebStorageEventSubscription && typeof window !== "undefined") {
+    window.removeEventListener("storage", handleWebStorageEvent);
+    hasWebStorageEventSubscription = false;
   }
-  window.addEventListener("storage", handleWebStorageEvent);
-  hasWebStorageEventSubscription = true;
 }
 function getScopedListeners(scope) {
   return webScopeListeners.get(scope);
@@ -225,12 +241,19 @@ function clearScopeRawCache(scope) {
   getScopeRawCache(scope).clear();
 }
 function notifyKeyListeners(registry, key) {
-  registry.get(key)?.forEach(listener => listener());
+  const listeners = registry.get(key);
+  if (listeners) {
+    for (const listener of listeners) {
+      listener();
+    }
+  }
 }
 function notifyAllListeners(registry) {
-  registry.forEach(listeners => {
-    listeners.forEach(listener => listener());
-  });
+  for (const listeners of registry.values()) {
+    for (const listener of listeners) {
+      listener();
+    }
+  }
 }
 function addKeyListener(registry, key, listener) {
   let listeners = registry.get(key);
@@ -276,7 +299,7 @@ function flushSecureWrites() {
     if (value === undefined) {
       keysToRemove.push(key);
     } else {
-      const resolvedAccessControl = accessControl ?? AccessControl.WhenUnlocked;
+      const resolvedAccessControl = accessControl ?? secureDefaultAccessControl;
       const existingGroup = groupedSetWrites.get(resolvedAccessControl);
       const group = existingGroup ?? {
         keys: [],
@@ -609,7 +632,12 @@ export const storage = {
       if (scope === StorageScope.Secure) {
         flushSecureWrites();
       }
-      clearScopeRawCache(scope);
+      const scopeCache = getScopeRawCache(scope);
+      for (const key of scopeCache.keys()) {
+        if (isNamespaced(key, namespace)) {
+          scopeCache.delete(key);
+        }
+      }
       WebStorage.removeByPrefix(keyPrefix, scope);
     });
   },
@@ -678,9 +706,13 @@ export const storage = {
         return result;
       }
       const keys = WebStorage.getAllKeys(scope);
-      keys.forEach(key => {
-        const val = WebStorage.get(key, scope);
-        if (val !== undefined) result[key] = val;
+      if (keys.length === 0) return {};
+      const values = WebStorage.getBatch(keys, scope);
+      keys.forEach((key, index) => {
+        const val = values[index];
+        if (val !== undefined && val !== null) {
+          result[key] = val;
+        }
       });
       return result;
     });
@@ -692,7 +724,8 @@ export const storage = {
       return WebStorage.size(scope);
     });
   },
-  setAccessControl: _level => {
+  setAccessControl: level => {
+    secureDefaultAccessControl = level;
     recordMetric("storage:setAccessControl", StorageScope.Secure, 0);
   },
   setSecureWritesAsync: _enabled => {
@@ -723,10 +756,48 @@ export const storage = {
   },
   resetMetrics: () => {
     metricsCounters.clear();
+  },
+  getString: (key, scope) => {
+    return measureOperation("storage:getString", scope, () => {
+      return getRawValue(key, scope);
+    });
+  },
+  setString: (key, value, scope) => {
+    measureOperation("storage:setString", scope, () => {
+      setRawValue(key, value, scope);
+    });
+  },
+  deleteString: (key, scope) => {
+    measureOperation("storage:deleteString", scope, () => {
+      removeRawValue(key, scope);
+    });
+  },
+  import: (data, scope) => {
+    const keys = Object.keys(data);
+    measureOperation("storage:import", scope, () => {
+      assertValidScope(scope);
+      if (keys.length === 0) return;
+      const values = keys.map(k => data[k]);
+      if (scope === StorageScope.Memory) {
+        keys.forEach((key, index) => {
+          memoryStore.set(key, values[index]);
+        });
+        keys.forEach(key => notifyKeyListeners(memoryListeners, key));
+        return;
+      }
+      if (scope === StorageScope.Secure) {
+        flushSecureWrites();
+        WebStorage.setSecureAccessControl(secureDefaultAccessControl);
+      }
+      WebStorage.setBatch(keys, values, scope);
+      keys.forEach((key, index) => cacheRawValue(scope, key, values[index]));
+    }, keys.length);
   }
 };
 export function setWebSecureStorageBackend(backend) {
   webSecureStorageBackend = backend ?? createLocalStorageWebSecureBackend();
+  cachedSecureBrowserStorage = undefined;
+  cachedSecureBackendRef = undefined;
   hydratedWebScopeKeyIndex.delete(StorageScope.Secure);
   clearScopeRawCache(StorageScope.Secure);
 }
@@ -807,12 +878,17 @@ export function createStorageItem(config) {
       }
       return memoryStore.get(storageKey);
     }
-    if (nonMemoryScope === StorageScope.Secure && !isBiometric && hasPendingSecureWrite(storageKey)) {
-      return readPendingSecureWrite(storageKey);
+    if (nonMemoryScope === StorageScope.Secure && !isBiometric) {
+      const pending = pendingSecureWrites.get(storageKey);
+      if (pending !== undefined) {
+        return pending.value;
+      }
     }
     if (readCache) {
-      if (hasCachedRawValue(nonMemoryScope, storageKey)) {
-        return readCachedRawValue(nonMemoryScope, storageKey);
+      const cache = getScopeRawCache(nonMemoryScope);
+      const cached = cache.get(storageKey);
+      if (cached !== undefined || cache.has(storageKey)) {
+        return cached;
       }
     }
     if (isBiometric) {
@@ -829,7 +905,7 @@ export function createStorageItem(config) {
     }
     cacheRawValue(nonMemoryScope, storageKey, rawValue);
     if (coalesceSecureWrites) {
-      scheduleSecureWrite(storageKey, rawValue, secureAccessControl ?? AccessControl.WhenUnlocked);
+      scheduleSecureWrite(storageKey, rawValue, secureAccessControl ?? secureDefaultAccessControl);
       return;
     }
     if (nonMemoryScope === StorageScope.Secure) {
@@ -844,7 +920,7 @@ export function createStorageItem(config) {
     }
     cacheRawValue(nonMemoryScope, storageKey, undefined);
     if (coalesceSecureWrites) {
-      scheduleSecureWrite(storageKey, undefined, secureAccessControl ?? AccessControl.WhenUnlocked);
+      scheduleSecureWrite(storageKey, undefined, secureAccessControl ?? secureDefaultAccessControl);
       return;
     }
     if (nonMemoryScope === StorageScope.Secure) {
@@ -907,6 +983,7 @@ export function createStorageItem(config) {
         onExpired?.(storageKey);
         lastValue = ensureValidatedValue(defaultValue, false);
         hasLastValue = true;
+        listeners.forEach(cb => cb());
         return lastValue;
       }
     }
@@ -942,6 +1019,7 @@ export function createStorageItem(config) {
             onExpired?.(storageKey);
             lastValue = ensureValidatedValue(defaultValue, false);
             hasLastValue = true;
+            listeners.forEach(cb => cb());
             return lastValue;
           }
           deserializableRaw = parsed.payload;
@@ -969,10 +1047,10 @@ export function createStorageItem(config) {
   const set = valueOrFn => {
     measureOperation("item:set", config.scope, () => {
       const newValue = isUpdater(valueOrFn) ? valueOrFn(getInternal()) : valueOrFn;
-      invalidateParsedCache();
       if (validate && !validate(newValue)) {
         throw new Error(`Validation failed for key "${storageKey}" in scope "${StorageScope[config.scope]}".`);
       }
+      invalidateParsedCache();
       writeValueWithoutValidation(newValue);
     });
   };
@@ -1011,6 +1089,9 @@ export function createStorageItem(config) {
       if (listeners.size === 0 && unsubscribe) {
         unsubscribe();
         unsubscribe = null;
+        if (!isMemory) {
+          maybeCleanupWebStorageSubscription();
+        }
       }
     };
   };
@@ -1028,6 +1109,9 @@ export function createStorageItem(config) {
       invalidateParsedCache();
       listeners.forEach(listener => listener());
     },
+    _invalidateParsedCacheOnly: () => {
+      invalidateParsedCache();
+    },
     _hasValidation: validate !== undefined,
     _hasExpiration: expiration !== undefined,
     _readCacheEnabled: readCache,
@@ -1042,6 +1126,7 @@ export function createStorageItem(config) {
   return storageItem;
 }
 export { useStorage, useStorageSelector, useSetStorage } from "./storage-hooks";
+export { createIndexedDBBackend } from "./indexeddb-backend";
 export function getBatch(items, scope) {
   return measureOperation("batch:get", scope, () => {
     assertBatchScope(items, scope);
@@ -1057,14 +1142,17 @@ export function getBatch(items, scope) {
     const keyIndexes = [];
     items.forEach((item, index) => {
       if (scope === StorageScope.Secure) {
-        if (hasPendingSecureWrite(item.key)) {
-          rawValues[index] = readPendingSecureWrite(item.key);
+        const pending = pendingSecureWrites.get(item.key);
+        if (pending !== undefined) {
+          rawValues[index] = pending.value;
           return;
         }
       }
       if (item._readCacheEnabled === true) {
-        if (hasCachedRawValue(scope, item.key)) {
-          rawValues[index] = readCachedRawValue(scope, item.key);
+        const cache = getScopeRawCache(scope);
+        const cached = cache.get(item.key);
+        if (cached !== undefined || cache.has(item.key)) {
+          rawValues[index] = cached;
           return;
         }
       }
@@ -1096,10 +1184,32 @@ export function setBatch(items, scope) {
   measureOperation("batch:set", scope, () => {
     assertBatchScope(items.map(batchEntry => batchEntry.item), scope);
     if (scope === StorageScope.Memory) {
+      // Determine if any item needs per-item handling (validation or TTL)
+      const needsIndividualSets = items.some(({
+        item
+      }) => {
+        const internal = asInternal(item);
+        return internal._hasValidation || internal._hasExpiration;
+      });
+      if (needsIndividualSets) {
+        items.forEach(({
+          item,
+          value
+        }) => item.set(value));
+        return;
+      }
+
+      // Atomic write: update all values in memoryStore, invalidate caches, then batch-notify
       items.forEach(({
         item,
         value
-      }) => item.set(value));
+      }) => {
+        memoryStore.set(item.key, value);
+        asInternal(item)._invalidateParsedCacheOnly();
+      });
+      items.forEach(({
+        item
+      }) => notifyKeyListeners(memoryListeners, item.key));
       return;
     }
     if (scope === StorageScope.Secure) {
@@ -1128,7 +1238,7 @@ export function setBatch(items, scope) {
         value,
         internal
       }) => {
-        const accessControl = internal._secureAccessControl ?? AccessControl.WhenUnlocked;
+        const accessControl = internal._secureAccessControl ?? secureDefaultAccessControl;
         const existingGroup = groupedByAccessControl.get(accessControl);
         const group = existingGroup ?? {
           keys: [],
@@ -1205,9 +1315,11 @@ export function migrateToLatest(scope = StorageScope.Disk) {
         return;
       }
       migration(context);
-      writeMigrationVersion(scope, version);
       appliedVersion = version;
     });
+    if (appliedVersion !== currentVersion) {
+      writeMigrationVersion(scope, appliedVersion);
+    }
     return appliedVersion;
   });
 }
@@ -1217,12 +1329,17 @@ export function runTransaction(scope, transaction) {
     if (scope === StorageScope.Secure) {
       flushSecureWrites();
     }
+    const NOT_SET = Symbol();
     const rollback = new Map();
     const rememberRollback = key => {
       if (rollback.has(key)) {
         return;
       }
-      rollback.set(key, getRawValue(key, scope));
+      if (scope === StorageScope.Memory) {
+        rollback.set(key, memoryStore.has(key) ? memoryStore.get(key) : NOT_SET);
+      } else {
+        rollback.set(key, getRawValue(key, scope));
+      }
     };
     const tx = {
       scope,
@@ -1256,11 +1373,12 @@ export function runTransaction(scope, transaction) {
       const rollbackEntries = Array.from(rollback.entries()).reverse();
       if (scope === StorageScope.Memory) {
         rollbackEntries.forEach(([key, previousValue]) => {
-          if (previousValue === undefined) {
-            removeRawValue(key, scope);
+          if (previousValue === NOT_SET) {
+            memoryStore.delete(key);
           } else {
-            setRawValue(key, previousValue, scope);
+            memoryStore.set(key, previousValue);
           }
+          notifyKeyListeners(memoryListeners, key);
         });
       } else {
         const keysToSet = [];
@@ -1319,4 +1437,7 @@ export function createSecureAuthStorage(config, options) {
   }
   return result;
 }
+export function isKeychainLockedError(_err) {
+  return false;
+}
 //# sourceMappingURL=index.web.js.map