react-native-onyx 3.0.67 → 3.0.69

package/dist/OnyxUtils.d.ts

@@ -135,7 +135,7 @@ declare function getCollectionDataAndSendAsObject<TKey extends OnyxKey>(matching
  * Remove a key from Onyx and update the subscribers
  */
 declare function remove<TKey extends OnyxKey>(key: TKey, isProcessingCollectionUpdate?: boolean): Promise<void>;
-declare function reportStorageQuota(): Promise<void>;
+declare function reportStorageQuota(error?: Error): Promise<void>;
 /**
  * Handles storage operation failures based on the error type:
  * - Storage capacity errors: evicts data and retries the operation

package/dist/OnyxUtils.js

@@ -231,6 +231,11 @@ function get(key) {
                 // The key is not a collection one or something went wrong during split, so we proceed with the function's logic.
             }
         }
+        // Prefer cache over stale storage if a concurrent write populated it during the read.
+        const cachedValue = OnyxCache_1.default.get(key);
+        if (cachedValue !== undefined) {
+            return cachedValue;
+        }
         if (val === undefined) {
             OnyxCache_1.default.addNullishStorageKey(key);
             return undefined;
@@ -633,13 +638,13 @@ function remove(key, isProcessingCollectionUpdate) {
     }
     return storage_1.default.removeItem(key).then(() => undefined);
 }
-function reportStorageQuota() {
+function reportStorageQuota(error) {
     return storage_1.default.getDatabaseSize()
         .then(({ bytesUsed, bytesRemaining }) => {
-        Logger.logInfo(`Storage Quota Check -- bytesUsed: ${bytesUsed} bytesRemaining: ${bytesRemaining}`);
+        Logger.logInfo(`Storage Quota Check -- bytesUsed: ${bytesUsed} bytesRemaining: ${bytesRemaining}. Original error: ${error}`);
     })
         .catch((dbSizeError) => {
-        Logger.logAlert(`Unable to get database size. Error: ${dbSizeError}`);
+        Logger.logAlert(`Unable to get database size. getDatabaseSize error: ${dbSizeError}. Original error: ${error}`);
     });
 }
 /**
@@ -654,7 +659,7 @@ function retryOperation(error, onyxMethod, defaultParams, retryAttempt) {
     const nextRetryAttempt = currentRetryAttempt + 1;
     Logger.logInfo(`Failed to save to storage. Error: ${error}. onyxMethod: ${onyxMethod.name}. retryAttempt: ${currentRetryAttempt}/${MAX_STORAGE_OPERATION_RETRY_ATTEMPTS}`);
     if (error && Str.startsWith(error.message, "Failed to execute 'put' on 'IDBObjectStore'")) {
-        Logger.logAlert('Attempted to set invalid data set in Onyx. Please ensure all data is serializable.');
+        Logger.logAlert(`Attempted to set invalid data set in Onyx. Please ensure all data is serializable. Error: ${error}`);
         throw error;
     }
     const errorMessage = (_b = (_a = error === null || error === void 0 ? void 0 : error.message) === null || _a === void 0 ? void 0 : _a.toLowerCase) === null || _b === void 0 ? void 0 : _b.call(_a);
@@ -674,12 +679,12 @@ function retryOperation(error, onyxMethod, defaultParams, retryAttempt) {
         // If we have no acceptable keys to remove then we are possibly trying to save mission critical data. If this is the case,
         // then we should stop retrying as there is not much the user can do to fix this. Instead of getting them stuck in an infinite loop we
         // will allow this write to be skipped.
-        Logger.logAlert('Out of storage. But found no acceptable keys to remove.');
-        return reportStorageQuota();
+        Logger.logAlert(`Out of storage. But found no acceptable keys to remove. Error: ${error}`);
+        return reportStorageQuota(error);
     }
     // Remove the least recently accessed key and retry.
-    Logger.logInfo(`Out of storage. Evicting least recently accessed key (${keyForRemoval}) and retrying.`);
-    reportStorageQuota();
+    Logger.logInfo(`Out of storage. Evicting least recently accessed key (${keyForRemoval}) and retrying. Error: ${error}`);
+    reportStorageQuota(error);
     // @ts-expect-error No overload matches this call.
     return remove(keyForRemoval).then(() => onyxMethod(defaultParams, nextRetryAttempt));
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-onyx",
-  "version": "3.0.67",
+  "version": "3.0.69",
   "author": "Expensify, Inc.",
   "homepage": "https://expensify.com",
   "description": "State management for React Native",