react-native-nitro-storage 0.10.3 → 0.11.0

package/lib/commonjs/storage-core.js

@@ -9,6 +9,7 @@ var _metrics = require("./core/metrics");
 var _internal = require("./internal");
 var _shared = require("./shared");
 var _storageEvents = require("./storage-events");
+var _storageRuntime = require("./storage-runtime");
 var _Storage = require("./Storage.types");
 const EMPTY_KEYS = Object.freeze([]);
 function asInternal(item) {
@@ -39,6 +40,14 @@ function createStorageCore(buildAdapter) {
   let eventObserverRedactSecureValues = true;
   const storageEvents = new _storageEvents.StorageEventRegistry();
   const metrics = (0, _metrics.createMetricsRegistry)();
+  function setOwnDataProperty(target, key, value) {
+    Object.defineProperty(target, key, {
+      configurable: true,
+      enumerable: true,
+      value,
+      writable: true
+    });
+  }
   const durability = (0, _durability.createDurabilityCoordinator)({
     backend: {
       setBatch: (keys, values, scope) => {
@@ -147,6 +156,19 @@ function createStorageCore(buildAdapter) {
     }
     return scope !== _Storage.StorageScope.Secure || !eventObserverRedactSecureValues;
   }
+  function readPreviousEventValue(scope, key, representation = "plain") {
+    if (!shouldReadPreviousEventValues(scope)) {
+      return undefined;
+    }
+    return getEventRawValueForRepresentation(scope, key, representation);
+  }
+  function toMemoryStoredValue(value) {
+    return typeof value === "string" ? (0, _internal.escapeCollidingRawValue)(value) : value;
+  }
+  function deleteMemoryKey(key) {
+    memoryStore.delete(key);
+    memoryExpirationDeadlines.delete(key);
+  }
   function eventForGlobalObserver(event) {
     if (!eventObserverRedactSecureValues || event.scope !== _Storage.StorageScope.Secure) {
       return event;
@@ -261,6 +283,7 @@ function createStorageCore(buildAdapter) {
   }
   function setRawValue(key, value, scope) {
     (0, _internal.assertValidScope)(scope);
+    (0, _internal.assertValidStorageKey)(key);
     const storedValue = (0, _internal.escapeCollidingRawValue)(value);
     const oldValue = scope === _Storage.StorageScope.Memory ? getEventRawValue(scope, key) : undefined;
     if (scope === _Storage.StorageScope.Memory) {
@@ -293,9 +316,10 @@ function createStorageCore(buildAdapter) {
   }
   function removeRawValue(key, scope) {
     (0, _internal.assertValidScope)(scope);
-    const oldValue = getEventRawValue(scope, key);
+    (0, _internal.assertValidStorageKey)(key);
+    const oldValue = readPreviousEventValue(scope, key);
     if (scope === _Storage.StorageScope.Memory) {
-      memoryStore.delete(key);
+      deleteMemoryKey(key);
       (0, _shared.notifyKeyListeners)(memoryListeners, key);
       emitKeyChange(scope, key, oldValue, undefined, "remove", "memory");
       return;
@@ -367,7 +391,7 @@ function createStorageCore(buildAdapter) {
           return;
         }
         const previousValues = shouldReadPreviousEventValues(scope) ? removeKeys.map(key => getEventRawValue(scope, key)) : [];
-        removeKeys.forEach(key => memoryStore.delete(key));
+        removeKeys.forEach(deleteMemoryKey);
         removeKeys.forEach(key => {
           (0, _shared.notifyKeyListeners)(memoryListeners, key);
         });
@@ -643,7 +667,11 @@ function createStorageCore(buildAdapter) {
       return measureOperation("storage:getKeysByPrefix", scope, () => {
         (0, _internal.assertValidScope)(scope);
         if (scope === _Storage.StorageScope.Memory) {
-          return Array.from(memoryStore.keys()).filter(key => key.startsWith(prefix));
+          const keys = [];
+          for (const key of memoryStore.keys()) {
+            if (key.startsWith(prefix)) keys.push(key);
+          }
+          return keys;
         }
         if (scope === _Storage.StorageScope.Disk) {
           flushDiskWrites();
@@ -665,7 +693,7 @@ function createStorageCore(buildAdapter) {
           keys.forEach(key => {
             const value = memoryStore.get(key);
             if (typeof value === "string") {
-              result[key] = value;
+              setOwnDataProperty(result, key, (0, _internal.unescapeCollidingRawValue)(value));
             }
           });
           return result;
@@ -680,7 +708,7 @@ function createStorageCore(buildAdapter) {
         keys.forEach((key, idx) => {
           const value = values[idx];
           if (value !== undefined) {
-            result[key] = (0, _internal.unescapeCollidingRawValue)(value);
+            setOwnDataProperty(result, key, (0, _internal.unescapeCollidingRawValue)(value));
           }
         });
         return result;
@@ -691,10 +719,11 @@ function createStorageCore(buildAdapter) {
         (0, _internal.assertValidScope)(scope);
         const result = {};
         if (scope === _Storage.StorageScope.Memory) {
-          for (const key of memoryStore.keys()) {
-            const value = memoryStore.get(key);
-            if (typeof value === "string") result[key] = (0, _internal.unescapeCollidingRawValue)(value);
-          }
+          memoryStore.forEach((value, key) => {
+            if (typeof value === "string") {
+              setOwnDataProperty(result, key, (0, _internal.unescapeCollidingRawValue)(value));
+            }
+          });
           return result;
         }
         if (scope === _Storage.StorageScope.Disk) {
@@ -708,7 +737,9 @@ function createStorageCore(buildAdapter) {
         const values = adapter.backend.getBatch(keys, scope);
         keys.forEach((key, idx) => {
           const val = values[idx];
-          if (val !== undefined) result[key] = (0, _internal.unescapeCollidingRawValue)(val);
+          if (val !== undefined) {
+            setOwnDataProperty(result, key, (0, _internal.unescapeCollidingRawValue)(val));
+          }
         });
         return result;
       });
@@ -819,10 +850,12 @@ function createStorageCore(buildAdapter) {
       const keys = Object.keys(data);
       measureOperation("storage:import", scope, () => {
         (0, _internal.assertValidScope)(scope);
+        keys.forEach(_internal.assertValidStorageKey);
         if (keys.length === 0) return;
         const values = keys.map(k => data[k]);
         const storedValues = values.map(_internal.escapeCollidingRawValue);
-        const changes = keys.map((key, index) => (0, _shared.createKeyChange)(scope, key, getEventRawValue(scope, key), values[index], "import", scope === _Storage.StorageScope.Memory ? "memory" : adapter.changeSource));
+        const readPrevious = scope === _Storage.StorageScope.Memory || shouldReadPreviousEventValues(scope);
+        const changes = keys.map((key, index) => (0, _shared.createKeyChange)(scope, key, readPrevious ? getEventRawValue(scope, key) : undefined, values[index], "import", scope === _Storage.StorageScope.Memory ? "memory" : adapter.changeSource));
         if (scope === _Storage.StorageScope.Memory) {
           keys.forEach((key, index) => {
             memoryStore.set(key, storedValues[index]);
@@ -852,6 +885,7 @@ function createStorageCore(buildAdapter) {
     }
   };
   function createStorageItem(config) {
+    (0, _internal.assertValidStorageKey)(config.key);
     const storageKey = (0, _internal.prefixKey)(config.namespace, config.key);
     const serialize = config.serialize ?? _shared.defaultSerialize;
     const deserialize = config.deserialize ?? _shared.defaultDeserialize;
@@ -972,13 +1006,15 @@ function createStorageCore(buildAdapter) {
       }
       if (isBiometric) {
         const raw = readBackendRaw(() => adapter.backend.getSecureBiometric(storageKey));
-        if (readCache) {
+        if (readCache || fallbackToCacheOnReadError) {
           cacheRawValue(resolveNonMemoryScope(), storageKey, raw, rawCacheRepresentation);
         }
         return raw;
       }
       const raw = readBackendRaw(() => adapter.backend.get(storageKey, config.scope));
-      cacheRawValue(resolveNonMemoryScope(), storageKey, raw);
+      if (readCache || fallbackToCacheOnReadError) {
+        cacheRawValue(resolveNonMemoryScope(), storageKey, raw);
+      }
       return raw;
     };
     const readBackendRaw = read => {
@@ -986,7 +1022,7 @@ function createStorageCore(buildAdapter) {
         return read();
       } catch (error) {
         onReadError?.(error);
-        if (fallbackToCacheOnReadError) {
+        if (fallbackToCacheOnReadError && (0, _storageRuntime.isStorageError)(error, "keychain_locked")) {
           const scope = resolveNonMemoryScope();
           const cached = readCachedRawValue(scope, storageKey, rawCacheRepresentation);
           if (cached !== undefined) {
@@ -1482,7 +1518,7 @@ function createStorageCore(buildAdapter) {
       }
     };
     const removeStoredRaw = (operation = "remove") => {
-      const oldValue = isBiometric ? getEventRawValueForRepresentation(config.scope, storageKey, "biometric") : getEventRawValue(config.scope, storageKey);
+      const oldValue = readPreviousEventValue(config.scope, storageKey, isBiometric ? "biometric" : "plain");
       if (isBiometric) {
         invalidateRawCache(_Storage.StorageScope.Secure, storageKey);
         scheduleRenameSourceCleanup();
@@ -1524,8 +1560,7 @@ function createStorageCore(buildAdapter) {
         } else {
           memoryExpirationDeadlines.delete(storageKey);
         }
-        const storedValue = typeof value === "string" ? (0, _internal.escapeCollidingRawValue)(value) : value;
-        memoryStore.set(storageKey, storedValue);
+        memoryStore.set(storageKey, toMemoryStoredValue(value));
         (0, _shared.notifyKeyListeners)(memoryListeners, storageKey);
         emitKeyChange(config.scope, storageKey, oldValue, typeof value === "string" ? value : undefined, "set", "memory");
         return;
@@ -1918,7 +1953,7 @@ function createStorageCore(buildAdapter) {
           item,
           value
         }) => {
-          memoryStore.set(item.key, value);
+          memoryStore.set(item.key, toMemoryStoredValue(value));
           asInternal(item)._invalidateParsedCacheOnly();
         });
         items.forEach(({
@@ -2211,7 +2246,11 @@ function createStorageCore(buildAdapter) {
         const rollbackEntries = Array.from(rollback.values()).reverse();
         const rollbackSource = scope === _Storage.StorageScope.Memory ? "memory" : adapter.changeSource;
         const rollbackErrors = [];
+        const readRollbackEvents = shouldReadPreviousEventValues(scope);
         const readRollbackEventValue = entry => {
+          if (!readRollbackEvents) {
+            return undefined;
+          }
           try {
             return getEventRawValueForRepresentation(scope, entry.key, entry.representation);
           } catch (readError) {
@@ -2455,7 +2494,7 @@ function createStorageCore(buildAdapter) {
     const initial = {};
     if (defaultValue) {
       for (const id of defaultValue) {
-        initial[id] = true;
+        setOwnDataProperty(initial, id, true);
       }
     }
     const item = createStorageItem({
@@ -2471,7 +2510,7 @@ function createStorageCore(buildAdapter) {
       const next = {
         ...current
       };
-      next[id] = true;
+      setOwnDataProperty(next, id, true);
       item.set(next);
     };
     const deleteId = id => {
@@ -2496,7 +2535,7 @@ function createStorageCore(buildAdapter) {
     const getTyped = () => {
       const typed = {};
       for (const id of Object.keys(item.get())) {
-        typed[id] = true;
+        setOwnDataProperty(typed, id, true);
       }
       return typed;
     };