react-native-nitro-storage 0.10.0 → 0.10.1

package/lib/module/storage-core.js

@@ -158,18 +158,6 @@ export function createStorageCore(buildAdapter) {
   function recordMetric(operation, scope, durationMs, keysCount = 1) {
     metrics.record(operation, scope, durationMs, keysCount);
   }
-  function readPendingSecureWrite(key) {
-    return durability.readPendingSecureWrite(key);
-  }
-  function readPendingDiskWrite(key) {
-    return durability.readPendingDiskWrite(key);
-  }
-  function hasPendingDiskWrite(key) {
-    return durability.hasPendingDiskWrite(key);
-  }
-  function hasPendingSecureWrite(key) {
-    return durability.hasPendingSecureWrite(key);
-  }
   function clearPendingDiskWrite(key) {
     durability.clearPendingDiskWrite(key);
   }
@@ -202,11 +190,17 @@ export function createStorageCore(buildAdapter) {
       const value = memoryStore.get(key);
       return typeof value === "string" ? value : undefined;
     }
-    if (scope === StorageScope.Disk && hasPendingDiskWrite(key)) {
-      return readPendingDiskWrite(key);
+    if (scope === StorageScope.Disk) {
+      const pending = durability.getPendingDiskWrite(key);
+      if (pending !== undefined) {
+        return pending.value;
+      }
     }
-    if (scope === StorageScope.Secure && hasPendingSecureWrite(key)) {
-      return readPendingSecureWrite(key);
+    if (scope === StorageScope.Secure) {
+      const pending = durability.getPendingSecureWrite(key);
+      if (pending !== undefined) {
+        return pending.value;
+      }
     }
     return adapter.backend.get(key, scope);
   }
@@ -222,13 +216,17 @@ export function createStorageCore(buildAdapter) {
       const value = memoryStore.get(key);
       return typeof value === "string" ? unescapeCollidingRawValue(value) : undefined;
     }
-    if (scope === StorageScope.Disk && hasPendingDiskWrite(key)) {
-      const pending = readPendingDiskWrite(key);
-      return pending === undefined ? undefined : unescapeCollidingRawValue(pending);
+    if (scope === StorageScope.Disk) {
+      const pending = durability.getPendingDiskWrite(key);
+      if (pending !== undefined) {
+        return pending.value === undefined ? undefined : unescapeCollidingRawValue(pending.value);
+      }
     }
-    if (scope === StorageScope.Secure && hasPendingSecureWrite(key)) {
-      const pending = readPendingSecureWrite(key);
-      return pending === undefined ? undefined : unescapeCollidingRawValue(pending);
+    if (scope === StorageScope.Secure) {
+      const pending = durability.getPendingSecureWrite(key);
+      if (pending !== undefined) {
+        return pending.value === undefined ? undefined : unescapeCollidingRawValue(pending.value);
+      }
     }
     const raw = adapter.backend.get(key, scope);
     return raw === undefined ? undefined : unescapeCollidingRawValue(raw);
@@ -906,24 +904,28 @@ export function createStorageCore(buildAdapter) {
         return typeof memoryStored === "string" ? unescapeCollidingRawValue(memoryStored) : memoryStored;
       }
       if (nonMemoryScope === StorageScope.Disk) {
-        if (durability.hasPendingDiskWrite(storageKey)) {
-          return durability.readPendingDiskWrite(storageKey);
+        const pending = durability.getPendingDiskWrite(storageKey);
+        if (pending !== undefined) {
+          return pending.value;
         }
       }
       if (nonMemoryScope === StorageScope.Secure && !isBiometric) {
-        if (durability.hasPendingSecureWrite(storageKey)) {
-          return durability.readPendingSecureWrite(storageKey);
+        const pending = durability.getPendingSecureWrite(storageKey);
+        if (pending !== undefined) {
+          return pending.value;
         }
       }
       migrateRenamesIfNeeded();
       if (nonMemoryScope === StorageScope.Disk) {
-        if (durability.hasPendingDiskWrite(storageKey)) {
-          return durability.readPendingDiskWrite(storageKey);
+        const pending = durability.getPendingDiskWrite(storageKey);
+        if (pending !== undefined) {
+          return pending.value;
         }
       }
       if (nonMemoryScope === StorageScope.Secure && !isBiometric) {
-        if (durability.hasPendingSecureWrite(storageKey)) {
-          return durability.readPendingSecureWrite(storageKey);
+        const pending = durability.getPendingSecureWrite(storageKey);
+        if (pending !== undefined) {
+          return pending.value;
         }
       }
       if (readCache) {
@@ -1111,19 +1113,22 @@ export function createStorageCore(buildAdapter) {
       const records = getItemStateKeys().map(key => {
         let pending;
         if (nonMemoryScope === StorageScope.Disk) {
-          if (durability.hasPendingDiskWrite(key)) {
+          const pendingWrite = durability.getPendingDiskWrite(key);
+          if (pendingWrite !== undefined) {
             pending = {
-              value: durability.readPendingDiskWrite(key)
+              value: pendingWrite.value
+            };
+          }
+        } else if (nonMemoryScope === StorageScope.Secure && !isBiometric) {
+          const pendingWrite = durability.getPendingSecureWrite(key);
+          if (pendingWrite !== undefined) {
+            pending = {
+              value: pendingWrite.value,
+              ...(pendingWrite.accessControl === undefined ? {} : {
+                accessControl: pendingWrite.accessControl
+              })
             };
           }
-        } else if (nonMemoryScope === StorageScope.Secure && !isBiometric && durability.hasPendingSecureWrite(key)) {
-          const accessControl = durability.readPendingSecureAccessControl(key);
-          pending = {
-            value: durability.readPendingSecureWrite(key),
-            ...(accessControl === undefined ? {} : {
-              accessControl
-            })
-          };
         }
         return {
           key,
@@ -1676,13 +1681,15 @@ export function createStorageCore(buildAdapter) {
       if (isMemory) return memoryStore.has(storageKey);
       if (isBiometric) return adapter.backend.hasSecureBiometric(storageKey);
       if (nonMemoryScope === StorageScope.Disk) {
-        if (durability.hasPendingDiskWrite(storageKey)) {
-          return durability.readPendingDiskWrite(storageKey) !== undefined;
+        const pending = durability.getPendingDiskWrite(storageKey);
+        if (pending !== undefined) {
+          return pending.value !== undefined;
         }
       }
       if (nonMemoryScope === StorageScope.Secure) {
-        if (durability.hasPendingSecureWrite(storageKey)) {
-          return durability.readPendingSecureWrite(storageKey) !== undefined;
+        const pending = durability.getPendingSecureWrite(storageKey);
+        if (pending !== undefined) {
+          return pending.value !== undefined;
         }
       }
       return adapter.backend.has(storageKey, config.scope);
@@ -1801,14 +1808,16 @@ export function createStorageCore(buildAdapter) {
       const keyIndexes = [];
       items.forEach((item, index) => {
         if (scope === StorageScope.Disk) {
-          if (durability.hasPendingDiskWrite(item.key)) {
-            rawValues[index] = durability.readPendingDiskWrite(item.key);
+          const pending = durability.getPendingDiskWrite(item.key);
+          if (pending !== undefined) {
+            rawValues[index] = pending.value;
             return;
           }
         }
         if (scope === StorageScope.Secure) {
-          if (durability.hasPendingSecureWrite(item.key)) {
-            rawValues[index] = durability.readPendingSecureWrite(item.key);
+          const pending = durability.getPendingSecureWrite(item.key);
+          if (pending !== undefined) {
+            rawValues[index] = pending.value;
             return;
           }
         }