react-native-nitro-storage 0.3.0 → 0.3.2

package/lib/commonjs/index.web.js

@@ -3,12 +3,25 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
+Object.defineProperty(exports, "AccessControl", {
+  enumerable: true,
+  get: function () {
+    return _Storage.AccessControl;
+  }
+});
+Object.defineProperty(exports, "BiometricLevel", {
+  enumerable: true,
+  get: function () {
+    return _Storage.BiometricLevel;
+  }
+});
 Object.defineProperty(exports, "StorageScope", {
   enumerable: true,
   get: function () {
     return _Storage.StorageScope;
   }
 });
+exports.createSecureAuthStorage = createSecureAuthStorage;
 exports.createStorageItem = createStorageItem;
 exports.getBatch = getBatch;
 Object.defineProperty(exports, "migrateFromMMKV", {
@@ -23,13 +36,37 @@ exports.removeBatch = removeBatch;
 exports.runTransaction = runTransaction;
 exports.setBatch = setBatch;
 exports.storage = void 0;
-exports.useSetStorage = useSetStorage;
-exports.useStorage = useStorage;
-exports.useStorageSelector = useStorageSelector;
-var _react = require("react");
+Object.defineProperty(exports, "useSetStorage", {
+  enumerable: true,
+  get: function () {
+    return _storageHooks.useSetStorage;
+  }
+});
+Object.defineProperty(exports, "useStorage", {
+  enumerable: true,
+  get: function () {
+    return _storageHooks.useStorage;
+  }
+});
+Object.defineProperty(exports, "useStorageSelector", {
+  enumerable: true,
+  get: function () {
+    return _storageHooks.useStorageSelector;
+  }
+});
 var _Storage = require("./Storage.types");
 var _internal = require("./internal");
 var _migration = require("./migration");
+var _storageHooks = require("./storage-hooks");
+function asInternal(item) {
+  return item;
+}
+function isUpdater(valueOrFn) {
+  return typeof valueOrFn === "function";
+}
+function typedKeys(record) {
+  return Object.keys(record);
+}
 const registeredMigrations = new Map();
 const runMicrotask = typeof queueMicrotask === "function" ? queueMicrotask : task => {
   Promise.resolve().then(task);
@@ -38,17 +75,71 @@ const memoryStore = new Map();
 const memoryListeners = new Map();
 const webScopeListeners = new Map([[_Storage.StorageScope.Disk, new Map()], [_Storage.StorageScope.Secure, new Map()]]);
 const scopedRawCache = new Map([[_Storage.StorageScope.Disk, new Map()], [_Storage.StorageScope.Secure, new Map()]]);
+const webScopeKeyIndex = new Map([[_Storage.StorageScope.Disk, new Set()], [_Storage.StorageScope.Secure, new Set()]]);
+const hydratedWebScopeKeyIndex = new Set();
 const pendingSecureWrites = new Map();
 let secureFlushScheduled = false;
+const SECURE_WEB_PREFIX = "__secure_";
+const BIOMETRIC_WEB_PREFIX = "__bio_";
+let hasWarnedAboutWebBiometricFallback = false;
 function getBrowserStorage(scope) {
   if (scope === _Storage.StorageScope.Disk) {
     return globalThis.localStorage;
   }
   if (scope === _Storage.StorageScope.Secure) {
-    return globalThis.sessionStorage;
+    return globalThis.localStorage;
   }
   return undefined;
 }
+function toSecureStorageKey(key) {
+  return `${SECURE_WEB_PREFIX}${key}`;
+}
+function fromSecureStorageKey(key) {
+  return key.slice(SECURE_WEB_PREFIX.length);
+}
+function toBiometricStorageKey(key) {
+  return `${BIOMETRIC_WEB_PREFIX}${key}`;
+}
+function fromBiometricStorageKey(key) {
+  return key.slice(BIOMETRIC_WEB_PREFIX.length);
+}
+function getWebScopeKeyIndex(scope) {
+  return webScopeKeyIndex.get(scope);
+}
+function hydrateWebScopeKeyIndex(scope) {
+  if (hydratedWebScopeKeyIndex.has(scope)) {
+    return;
+  }
+  const storage = getBrowserStorage(scope);
+  const keyIndex = getWebScopeKeyIndex(scope);
+  keyIndex.clear();
+  if (storage) {
+    for (let index = 0; index < storage.length; index += 1) {
+      const key = storage.key(index);
+      if (!key) {
+        continue;
+      }
+      if (scope === _Storage.StorageScope.Disk) {
+        if (!key.startsWith(SECURE_WEB_PREFIX) && !key.startsWith(BIOMETRIC_WEB_PREFIX)) {
+          keyIndex.add(key);
+        }
+        continue;
+      }
+      if (key.startsWith(SECURE_WEB_PREFIX)) {
+        keyIndex.add(fromSecureStorageKey(key));
+        continue;
+      }
+      if (key.startsWith(BIOMETRIC_WEB_PREFIX)) {
+        keyIndex.add(fromBiometricStorageKey(key));
+      }
+    }
+  }
+  hydratedWebScopeKeyIndex.add(scope);
+}
+function ensureWebScopeKeyIndex(scope) {
+  hydrateWebScopeKeyIndex(scope);
+  return getWebScopeKeyIndex(scope);
+}
 function getScopedListeners(scope) {
   return webScopeListeners.get(scope);
 }
@@ -147,26 +238,65 @@ const WebStorage = {
   dispose: () => {},
   set: (key, value, scope) => {
     const storage = getBrowserStorage(scope);
-    storage?.setItem(key, value);
+    if (!storage) {
+      return;
+    }
+    const storageKey = scope === _Storage.StorageScope.Secure ? toSecureStorageKey(key) : key;
+    storage.setItem(storageKey, value);
     if (scope === _Storage.StorageScope.Disk || scope === _Storage.StorageScope.Secure) {
+      ensureWebScopeKeyIndex(scope).add(key);
       notifyKeyListeners(getScopedListeners(scope), key);
     }
   },
   get: (key, scope) => {
     const storage = getBrowserStorage(scope);
-    return storage?.getItem(key) ?? undefined;
+    const storageKey = scope === _Storage.StorageScope.Secure ? toSecureStorageKey(key) : key;
+    return storage?.getItem(storageKey) ?? undefined;
   },
   remove: (key, scope) => {
     const storage = getBrowserStorage(scope);
-    storage?.removeItem(key);
+    if (!storage) {
+      return;
+    }
+    if (scope === _Storage.StorageScope.Secure) {
+      storage.removeItem(toSecureStorageKey(key));
+      storage.removeItem(toBiometricStorageKey(key));
+    } else {
+      storage.removeItem(key);
+    }
     if (scope === _Storage.StorageScope.Disk || scope === _Storage.StorageScope.Secure) {
+      ensureWebScopeKeyIndex(scope).delete(key);
       notifyKeyListeners(getScopedListeners(scope), key);
     }
   },
   clear: scope => {
     const storage = getBrowserStorage(scope);
-    storage?.clear();
+    if (!storage) {
+      return;
+    }
+    if (scope === _Storage.StorageScope.Secure) {
+      const keysToRemove = [];
+      for (let i = 0; i < storage.length; i++) {
+        const key = storage.key(i);
+        if (key?.startsWith(SECURE_WEB_PREFIX) || key?.startsWith(BIOMETRIC_WEB_PREFIX)) {
+          keysToRemove.push(key);
+        }
+      }
+      keysToRemove.forEach(key => storage.removeItem(key));
+    } else if (scope === _Storage.StorageScope.Disk) {
+      const keysToRemove = [];
+      for (let i = 0; i < storage.length; i++) {
+        const key = storage.key(i);
+        if (key && !key.startsWith(SECURE_WEB_PREFIX) && !key.startsWith(BIOMETRIC_WEB_PREFIX)) {
+          keysToRemove.push(key);
+        }
+      }
+      keysToRemove.forEach(key => storage.removeItem(key));
+    } else {
+      storage.clear();
+    }
     if (scope === _Storage.StorageScope.Disk || scope === _Storage.StorageScope.Secure) {
+      ensureWebScopeKeyIndex(scope).clear();
       notifyAllListeners(getScopedListeners(scope));
     }
   },
@@ -176,32 +306,129 @@ const WebStorage = {
       return;
     }
     keys.forEach((key, index) => {
-      storage.setItem(key, values[index]);
+      const value = values[index];
+      if (value === undefined) {
+        return;
+      }
+      const storageKey = scope === _Storage.StorageScope.Secure ? toSecureStorageKey(key) : key;
+      storage.setItem(storageKey, value);
     });
     if (scope === _Storage.StorageScope.Disk || scope === _Storage.StorageScope.Secure) {
+      const keyIndex = ensureWebScopeKeyIndex(scope);
+      keys.forEach(key => keyIndex.add(key));
       const listeners = getScopedListeners(scope);
       keys.forEach(key => notifyKeyListeners(listeners, key));
     }
   },
   getBatch: (keys, scope) => {
     const storage = getBrowserStorage(scope);
-    return keys.map(key => storage?.getItem(key) ?? undefined);
+    return keys.map(key => {
+      const storageKey = scope === _Storage.StorageScope.Secure ? toSecureStorageKey(key) : key;
+      return storage?.getItem(storageKey) ?? undefined;
+    });
   },
   removeBatch: (keys, scope) => {
     const storage = getBrowserStorage(scope);
     if (!storage) {
       return;
     }
-    keys.forEach(key => {
-      storage.removeItem(key);
-    });
+    if (scope === _Storage.StorageScope.Secure) {
+      keys.forEach(key => {
+        storage.removeItem(toSecureStorageKey(key));
+        storage.removeItem(toBiometricStorageKey(key));
+      });
+    } else {
+      keys.forEach(key => {
+        storage.removeItem(key);
+      });
+    }
     if (scope === _Storage.StorageScope.Disk || scope === _Storage.StorageScope.Secure) {
+      const keyIndex = ensureWebScopeKeyIndex(scope);
+      keys.forEach(key => keyIndex.delete(key));
       const listeners = getScopedListeners(scope);
       keys.forEach(key => notifyKeyListeners(listeners, key));
     }
   },
+  removeByPrefix: (prefix, scope) => {
+    if (scope !== _Storage.StorageScope.Disk && scope !== _Storage.StorageScope.Secure) {
+      return;
+    }
+    const keyIndex = ensureWebScopeKeyIndex(scope);
+    const keys = Array.from(keyIndex).filter(key => key.startsWith(prefix));
+    if (keys.length === 0) {
+      return;
+    }
+    WebStorage.removeBatch(keys, scope);
+  },
   addOnChange: (_scope, _callback) => {
     return () => {};
+  },
+  has: (key, scope) => {
+    const storage = getBrowserStorage(scope);
+    if (scope === _Storage.StorageScope.Secure) {
+      return storage?.getItem(toSecureStorageKey(key)) !== null || storage?.getItem(toBiometricStorageKey(key)) !== null;
+    }
+    return storage?.getItem(key) !== null;
+  },
+  getAllKeys: scope => {
+    if (scope !== _Storage.StorageScope.Disk && scope !== _Storage.StorageScope.Secure) {
+      return [];
+    }
+    return Array.from(ensureWebScopeKeyIndex(scope));
+  },
+  size: scope => {
+    if (scope === _Storage.StorageScope.Disk || scope === _Storage.StorageScope.Secure) {
+      return ensureWebScopeKeyIndex(scope).size;
+    }
+    return 0;
+  },
+  setSecureAccessControl: () => {},
+  setSecureWritesAsync: _enabled => {},
+  setKeychainAccessGroup: () => {},
+  setSecureBiometric: (key, value) => {
+    if (typeof __DEV__ !== "undefined" && __DEV__ && !hasWarnedAboutWebBiometricFallback) {
+      hasWarnedAboutWebBiometricFallback = true;
+      console.warn("[NitroStorage] Biometric storage is not supported on web. Using localStorage.");
+    }
+    globalThis.localStorage?.setItem(toBiometricStorageKey(key), value);
+    ensureWebScopeKeyIndex(_Storage.StorageScope.Secure).add(key);
+    notifyKeyListeners(getScopedListeners(_Storage.StorageScope.Secure), key);
+  },
+  getSecureBiometric: key => {
+    return globalThis.localStorage?.getItem(toBiometricStorageKey(key)) ?? undefined;
+  },
+  deleteSecureBiometric: key => {
+    const storage = globalThis.localStorage;
+    storage?.removeItem(toBiometricStorageKey(key));
+    if (storage?.getItem(toSecureStorageKey(key)) === null) {
+      ensureWebScopeKeyIndex(_Storage.StorageScope.Secure).delete(key);
+    }
+    notifyKeyListeners(getScopedListeners(_Storage.StorageScope.Secure), key);
+  },
+  hasSecureBiometric: key => {
+    return globalThis.localStorage?.getItem(toBiometricStorageKey(key)) !== null;
+  },
+  clearSecureBiometric: () => {
+    const storage = globalThis.localStorage;
+    if (!storage) return;
+    const keysToNotify = [];
+    const toRemove = [];
+    for (let i = 0; i < storage.length; i++) {
+      const k = storage.key(i);
+      if (k?.startsWith(BIOMETRIC_WEB_PREFIX)) {
+        toRemove.push(k);
+        keysToNotify.push(fromBiometricStorageKey(k));
+      }
+    }
+    toRemove.forEach(k => storage.removeItem(k));
+    const keyIndex = ensureWebScopeKeyIndex(_Storage.StorageScope.Secure);
+    keysToNotify.forEach(key => {
+      if (storage.getItem(toSecureStorageKey(key)) === null) {
+        keyIndex.delete(key);
+      }
+    });
+    const listeners = getScopedListeners(_Storage.StorageScope.Secure);
+    keysToNotify.forEach(key => notifyKeyListeners(listeners, key));
   }
 };
 function getRawValue(key, scope) {
@@ -272,10 +499,71 @@ const storage = exports.storage = {
     storage.clear(_Storage.StorageScope.Memory);
     storage.clear(_Storage.StorageScope.Disk);
     storage.clear(_Storage.StorageScope.Secure);
-  }
+  },
+  clearNamespace: (namespace, scope) => {
+    (0, _internal.assertValidScope)(scope);
+    if (scope === _Storage.StorageScope.Memory) {
+      for (const key of memoryStore.keys()) {
+        if ((0, _internal.isNamespaced)(key, namespace)) {
+          memoryStore.delete(key);
+        }
+      }
+      notifyAllListeners(memoryListeners);
+      return;
+    }
+    const keyPrefix = (0, _internal.prefixKey)(namespace, "");
+    if (scope === _Storage.StorageScope.Secure) {
+      flushSecureWrites();
+    }
+    clearScopeRawCache(scope);
+    WebStorage.removeByPrefix(keyPrefix, scope);
+  },
+  clearBiometric: () => {
+    WebStorage.clearSecureBiometric();
+  },
+  has: (key, scope) => {
+    (0, _internal.assertValidScope)(scope);
+    if (scope === _Storage.StorageScope.Memory) return memoryStore.has(key);
+    return WebStorage.has(key, scope);
+  },
+  getAllKeys: scope => {
+    (0, _internal.assertValidScope)(scope);
+    if (scope === _Storage.StorageScope.Memory) return Array.from(memoryStore.keys());
+    return WebStorage.getAllKeys(scope);
+  },
+  getAll: scope => {
+    (0, _internal.assertValidScope)(scope);
+    const result = {};
+    if (scope === _Storage.StorageScope.Memory) {
+      memoryStore.forEach((value, key) => {
+        if (typeof value === "string") result[key] = value;
+      });
+      return result;
+    }
+    const keys = WebStorage.getAllKeys(scope);
+    keys.forEach(key => {
+      const val = WebStorage.get(key, scope);
+      if (val !== undefined) result[key] = val;
+    });
+    return result;
+  },
+  size: scope => {
+    (0, _internal.assertValidScope)(scope);
+    if (scope === _Storage.StorageScope.Memory) return memoryStore.size;
+    return WebStorage.size(scope);
+  },
+  setAccessControl: _level => {},
+  setSecureWritesAsync: _enabled => {},
+  flushSecureWrites: () => {
+    flushSecureWrites();
+  },
+  setKeychainAccessGroup: _group => {}
 };
 function canUseRawBatchPath(item) {
-  return item._hasExpiration === false && item._hasValidation === false;
+  return item._hasExpiration === false && item._hasValidation === false && item._isBiometric !== true && item._secureAccessControl === undefined;
+}
+function canUseSecureRawBatchPath(item) {
+  return item._hasExpiration === false && item._hasValidation === false && item._isBiometric !== true;
 }
 function defaultSerialize(value) {
   return (0, _internal.serializeWithPrimitiveFastPath)(value);
@@ -284,16 +572,21 @@ function defaultDeserialize(value) {
   return (0, _internal.deserializeWithPrimitiveFastPath)(value);
 }
 function createStorageItem(config) {
+  const storageKey = (0, _internal.prefixKey)(config.namespace, config.key);
   const serialize = config.serialize ?? defaultSerialize;
   const deserialize = config.deserialize ?? defaultDeserialize;
   const isMemory = config.scope === _Storage.StorageScope.Memory;
+  const isBiometric = config.biometric === true && config.scope === _Storage.StorageScope.Secure;
+  const secureAccessControl = config.accessControl;
   const validate = config.validate;
   const onValidationError = config.onValidationError;
   const expiration = config.expiration;
+  const onExpired = config.onExpired;
   const expirationTtlMs = expiration?.ttlMs;
   const memoryExpiration = expiration && isMemory ? new Map() : null;
   const readCache = !isMemory && config.readCache === true;
-  const coalesceSecureWrites = config.scope === _Storage.StorageScope.Secure && config.coalesceSecureWrites === true;
+  const coalesceSecureWrites = config.scope === _Storage.StorageScope.Secure && config.coalesceSecureWrites === true && !isBiometric && secureAccessControl === undefined;
+  const defaultValue = config.defaultValue;
   const nonMemoryScope = config.scope === _Storage.StorageScope.Disk ? _Storage.StorageScope.Disk : config.scope === _Storage.StorageScope.Secure ? _Storage.StorageScope.Secure : null;
   if (expiration && expiration.ttlMs <= 0) {
     throw new Error("expiration.ttlMs must be greater than 0.");
@@ -303,10 +596,12 @@ function createStorageItem(config) {
   let lastRaw = undefined;
   let lastValue;
   let hasLastValue = false;
+  let lastExpiresAt = undefined;
   const invalidateParsedCache = () => {
     lastRaw = undefined;
     lastValue = undefined;
     hasLastValue = false;
+    lastExpiresAt = undefined;
   };
   const ensureSubscription = () => {
     if (unsubscribe) {
@@ -317,65 +612,77 @@ function createStorageItem(config) {
       listeners.forEach(callback => callback());
     };
     if (isMemory) {
-      unsubscribe = addKeyListener(memoryListeners, config.key, listener);
+      unsubscribe = addKeyListener(memoryListeners, storageKey, listener);
       return;
     }
-    unsubscribe = addKeyListener(getScopedListeners(nonMemoryScope), config.key, listener);
+    unsubscribe = addKeyListener(getScopedListeners(nonMemoryScope), storageKey, listener);
   };
   const readStoredRaw = () => {
     if (isMemory) {
       if (memoryExpiration) {
-        const expiresAt = memoryExpiration.get(config.key);
+        const expiresAt = memoryExpiration.get(storageKey);
         if (expiresAt !== undefined && expiresAt <= Date.now()) {
-          memoryExpiration.delete(config.key);
-          memoryStore.delete(config.key);
-          notifyKeyListeners(memoryListeners, config.key);
+          memoryExpiration.delete(storageKey);
+          memoryStore.delete(storageKey);
+          notifyKeyListeners(memoryListeners, storageKey);
+          onExpired?.(storageKey);
           return undefined;
         }
       }
-      return memoryStore.get(config.key);
+      return memoryStore.get(storageKey);
     }
-    if (nonMemoryScope === _Storage.StorageScope.Secure && hasPendingSecureWrite(config.key)) {
-      return readPendingSecureWrite(config.key);
+    if (nonMemoryScope === _Storage.StorageScope.Secure && !isBiometric && hasPendingSecureWrite(storageKey)) {
+      return readPendingSecureWrite(storageKey);
     }
     if (readCache) {
-      if (hasCachedRawValue(nonMemoryScope, config.key)) {
-        return readCachedRawValue(nonMemoryScope, config.key);
+      if (hasCachedRawValue(nonMemoryScope, storageKey)) {
+        return readCachedRawValue(nonMemoryScope, storageKey);
       }
     }
-    const raw = WebStorage.get(config.key, config.scope);
-    cacheRawValue(nonMemoryScope, config.key, raw);
+    if (isBiometric) {
+      return WebStorage.getSecureBiometric(storageKey);
+    }
+    const raw = WebStorage.get(storageKey, config.scope);
+    cacheRawValue(nonMemoryScope, storageKey, raw);
     return raw;
   };
   const writeStoredRaw = rawValue => {
-    cacheRawValue(nonMemoryScope, config.key, rawValue);
+    if (isBiometric) {
+      WebStorage.setSecureBiometric(storageKey, rawValue);
+      return;
+    }
+    cacheRawValue(nonMemoryScope, storageKey, rawValue);
     if (coalesceSecureWrites) {
-      scheduleSecureWrite(config.key, rawValue);
+      scheduleSecureWrite(storageKey, rawValue);
       return;
     }
     if (nonMemoryScope === _Storage.StorageScope.Secure) {
-      clearPendingSecureWrite(config.key);
+      clearPendingSecureWrite(storageKey);
     }
-    WebStorage.set(config.key, rawValue, config.scope);
+    WebStorage.set(storageKey, rawValue, config.scope);
   };
   const removeStoredRaw = () => {
-    cacheRawValue(nonMemoryScope, config.key, undefined);
+    if (isBiometric) {
+      WebStorage.deleteSecureBiometric(storageKey);
+      return;
+    }
+    cacheRawValue(nonMemoryScope, storageKey, undefined);
     if (coalesceSecureWrites) {
-      scheduleSecureWrite(config.key, undefined);
+      scheduleSecureWrite(storageKey, undefined);
       return;
     }
     if (nonMemoryScope === _Storage.StorageScope.Secure) {
-      clearPendingSecureWrite(config.key);
+      clearPendingSecureWrite(storageKey);
     }
-    WebStorage.remove(config.key, config.scope);
+    WebStorage.remove(storageKey, config.scope);
   };
   const writeValueWithoutValidation = value => {
     if (isMemory) {
       if (memoryExpiration) {
-        memoryExpiration.set(config.key, Date.now() + (expirationTtlMs ?? 0));
+        memoryExpiration.set(storageKey, Date.now() + (expirationTtlMs ?? 0));
       }
-      memoryStore.set(config.key, value);
-      notifyKeyListeners(memoryListeners, config.key);
+      memoryStore.set(storageKey, value);
+      notifyKeyListeners(memoryListeners, storageKey);
       return;
     }
     const serialized = serialize(value);
@@ -394,7 +701,7 @@ function createStorageItem(config) {
     if (onValidationError) {
       return onValidationError(invalidValue);
     }
-    return config.defaultValue;
+    return defaultValue;
   };
   const ensureValidatedValue = (candidate, hadStoredValue) => {
     if (!validate || validate(candidate)) {
@@ -402,7 +709,7 @@ function createStorageItem(config) {
     }
     const resolved = resolveInvalidValue(candidate);
     if (validate && !validate(resolved)) {
-      return config.defaultValue;
+      return defaultValue;
     }
     if (hadStoredValue) {
       writeValueWithoutValidation(resolved);
@@ -411,30 +718,53 @@ function createStorageItem(config) {
   };
   const get = () => {
     const raw = readStoredRaw();
-    const canUseCachedValue = !expiration && !memoryExpiration;
-    if (canUseCachedValue && raw === lastRaw && hasLastValue) {
-      return lastValue;
+    if (!memoryExpiration && raw === lastRaw && hasLastValue) {
+      if (!expiration || lastExpiresAt === null) {
+        return lastValue;
+      }
+      if (typeof lastExpiresAt === "number") {
+        if (lastExpiresAt > Date.now()) {
+          return lastValue;
+        }
+        removeStoredRaw();
+        invalidateParsedCache();
+        onExpired?.(storageKey);
+        lastValue = ensureValidatedValue(defaultValue, false);
+        hasLastValue = true;
+        return lastValue;
+      }
     }
     lastRaw = raw;
     if (raw === undefined) {
-      lastValue = ensureValidatedValue(config.defaultValue, false);
+      lastExpiresAt = undefined;
+      lastValue = ensureValidatedValue(defaultValue, false);
       hasLastValue = true;
       return lastValue;
     }
     if (isMemory) {
+      lastExpiresAt = undefined;
       lastValue = ensureValidatedValue(raw, true);
       hasLastValue = true;
       return lastValue;
     }
+    if (typeof raw !== "string") {
+      lastExpiresAt = undefined;
+      lastValue = ensureValidatedValue(defaultValue, false);
+      hasLastValue = true;
+      return lastValue;
+    }
     let deserializableRaw = raw;
     if (expiration) {
+      let envelopeExpiresAt = null;
       try {
         const parsed = JSON.parse(raw);
         if ((0, _internal.isStoredEnvelope)(parsed)) {
+          envelopeExpiresAt = parsed.expiresAt;
           if (parsed.expiresAt <= Date.now()) {
             removeStoredRaw();
             invalidateParsedCache();
-            lastValue = ensureValidatedValue(config.defaultValue, false);
+            onExpired?.(storageKey);
+            lastValue = ensureValidatedValue(defaultValue, false);
             hasLastValue = true;
             return lastValue;
           }
@@ -443,17 +773,19 @@ function createStorageItem(config) {
       } catch {
         // Keep backward compatibility with legacy raw values.
       }
+      lastExpiresAt = envelopeExpiresAt;
+    } else {
+      lastExpiresAt = undefined;
     }
     lastValue = ensureValidatedValue(deserialize(deserializableRaw), true);
     hasLastValue = true;
     return lastValue;
   };
   const set = valueOrFn => {
-    const currentValue = get();
-    const newValue = typeof valueOrFn === "function" ? valueOrFn(currentValue) : valueOrFn;
+    const newValue = isUpdater(valueOrFn) ? valueOrFn(get()) : valueOrFn;
     invalidateParsedCache();
     if (validate && !validate(newValue)) {
-      throw new Error(`Validation failed for key "${config.key}" in scope "${_Storage.StorageScope[config.scope]}".`);
+      throw new Error(`Validation failed for key "${storageKey}" in scope "${_Storage.StorageScope[config.scope]}".`);
     }
     writeValueWithoutValidation(newValue);
   };
@@ -461,14 +793,19 @@ function createStorageItem(config) {
     invalidateParsedCache();
     if (isMemory) {
       if (memoryExpiration) {
-        memoryExpiration.delete(config.key);
+        memoryExpiration.delete(storageKey);
       }
-      memoryStore.delete(config.key);
-      notifyKeyListeners(memoryListeners, config.key);
+      memoryStore.delete(storageKey);
+      notifyKeyListeners(memoryListeners, storageKey);
       return;
     }
     removeStoredRaw();
   };
+  const hasItem = () => {
+    if (isMemory) return memoryStore.has(storageKey);
+    if (isBiometric) return WebStorage.hasSecureBiometric(storageKey);
+    return WebStorage.has(storageKey, config.scope);
+  };
   const subscribe = callback => {
     ensureSubscription();
     listeners.add(callback);
@@ -484,6 +821,7 @@ function createStorageItem(config) {
     get,
     set,
     delete: deleteItem,
+    has: hasItem,
     subscribe,
     serialize,
     deserialize,
@@ -494,43 +832,21 @@ function createStorageItem(config) {
     _hasValidation: validate !== undefined,
     _hasExpiration: expiration !== undefined,
     _readCacheEnabled: readCache,
+    _isBiometric: isBiometric,
+    ...(secureAccessControl !== undefined ? {
+      _secureAccessControl: secureAccessControl
+    } : {}),
     scope: config.scope,
-    key: config.key
+    key: storageKey
   };
   return storageItem;
 }
-function useStorage(item) {
-  const value = (0, _react.useSyncExternalStore)(item.subscribe, item.get, item.get);
-  return [value, item.set];
-}
-function useStorageSelector(item, selector, isEqual = Object.is) {
-  const selectedRef = (0, _react.useRef)({
-    hasValue: false
-  });
-  const getSelectedSnapshot = () => {
-    const nextSelected = selector(item.get());
-    const current = selectedRef.current;
-    if (current.hasValue && isEqual(current.value, nextSelected)) {
-      return current.value;
-    }
-    selectedRef.current = {
-      hasValue: true,
-      value: nextSelected
-    };
-    return nextSelected;
-  };
-  const selectedValue = (0, _react.useSyncExternalStore)(item.subscribe, getSelectedSnapshot, getSelectedSnapshot);
-  return [selectedValue, item.set];
-}
-function useSetStorage(item) {
-  return item.set;
-}
 function getBatch(items, scope) {
   (0, _internal.assertBatchScope)(items, scope);
   if (scope === _Storage.StorageScope.Memory) {
     return items.map(item => item.get());
   }
-  const useRawBatchPath = items.every(item => canUseRawBatchPath(item));
+  const useRawBatchPath = items.every(item => scope === _Storage.StorageScope.Secure ? canUseSecureRawBatchPath(item) : canUseRawBatchPath(item));
   if (!useRawBatchPath) {
     return items.map(item => item.get());
   }
@@ -559,6 +875,9 @@ function getBatch(items, scope) {
     fetchedValues.forEach((value, index) => {
       const key = keysToFetch[index];
       const targetIndex = keyIndexes[index];
+      if (key === undefined || targetIndex === undefined) {
+        return;
+      }
       rawValues[targetIndex] = value;
       cacheRawValue(scope, key, value);
     });
@@ -580,9 +899,54 @@ function setBatch(items, scope) {
     }) => item.set(value));
     return;
   }
+  if (scope === _Storage.StorageScope.Secure) {
+    const secureEntries = items.map(({
+      item,
+      value
+    }) => ({
+      item,
+      value,
+      internal: asInternal(item)
+    }));
+    const canUseSecureBatchPath = secureEntries.every(({
+      internal
+    }) => canUseSecureRawBatchPath(internal));
+    if (!canUseSecureBatchPath) {
+      items.forEach(({
+        item,
+        value
+      }) => item.set(value));
+      return;
+    }
+    flushSecureWrites();
+    const groupedByAccessControl = new Map();
+    secureEntries.forEach(({
+      item,
+      value,
+      internal
+    }) => {
+      const accessControl = internal._secureAccessControl ?? _Storage.AccessControl.WhenUnlocked;
+      const existingGroup = groupedByAccessControl.get(accessControl);
+      const group = existingGroup ?? {
+        keys: [],
+        values: []
+      };
+      group.keys.push(item.key);
+      group.values.push(item.serialize(value));
+      if (!existingGroup) {
+        groupedByAccessControl.set(accessControl, group);
+      }
+    });
+    groupedByAccessControl.forEach((group, accessControl) => {
+      WebStorage.setSecureAccessControl(accessControl);
+      WebStorage.setBatch(group.keys, group.values, scope);
+      group.keys.forEach((key, index) => cacheRawValue(scope, key, group.values[index]));
+    });
+    return;
+  }
   const useRawBatchPath = items.every(({
     item
-  }) => canUseRawBatchPath(item));
+  }) => canUseRawBatchPath(asInternal(item)));
   if (!useRawBatchPath) {
     items.forEach(({
       item,
@@ -592,9 +956,6 @@ function setBatch(items, scope) {
   }
   const keys = items.map(entry => entry.item.key);
   const values = items.map(entry => entry.item.serialize(entry.value));
-  if (scope === _Storage.StorageScope.Secure) {
-    flushSecureWrites();
-  }
   WebStorage.setBatch(keys, values, scope);
   keys.forEach((key, index) => cacheRawValue(scope, key, values[index]));
 }
@@ -693,4 +1054,30 @@ function runTransaction(scope, transaction) {
     throw error;
   }
 }
+function createSecureAuthStorage(config, options) {
+  const ns = options?.namespace ?? "auth";
+  const result = {};
+  for (const key of typedKeys(config)) {
+    const itemConfig = config[key];
+    const expirationConfig = itemConfig.ttlMs !== undefined ? {
+      ttlMs: itemConfig.ttlMs
+    } : undefined;
+    result[key] = createStorageItem({
+      key,
+      scope: _Storage.StorageScope.Secure,
+      defaultValue: "",
+      namespace: ns,
+      ...(itemConfig.biometric !== undefined ? {
+        biometric: itemConfig.biometric
+      } : {}),
+      ...(itemConfig.accessControl !== undefined ? {
+        accessControl: itemConfig.accessControl
+      } : {}),
+      ...(expirationConfig !== undefined ? {
+        expiration: expirationConfig
+      } : {})
+    });
+  }
+  return result;
+}
 //# sourceMappingURL=index.web.js.map