react-native-onyx 3.0.74 → 3.0.76

package/dist/OnyxUtils.d.ts

@@ -137,6 +137,7 @@ 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
  * - Invalid data errors: logs an alert and throws an error
+ * - Non-retriable errors: logs an alert and resolves without retrying
  * - Other errors: retries the operation
  */
 declare function retryOperation<TMethod extends RetriableOnyxOperation>(error: Error, onyxMethod: TMethod, defaultParams: Parameters<TMethod>[0], retryAttempt: number | undefined): Promise<void>;
@@ -254,10 +255,6 @@ declare function mergeCollectionWithPatches<TKey extends CollectionKeyBase>({ co
 declare function partialSetCollection<TKey extends CollectionKeyBase>({ collectionKey, collection }: SetCollectionParams<TKey>, retryAttempt?: number): Promise<void>;
 declare function logKeyChanged(onyxMethod: Extract<OnyxMethod, 'set' | 'merge'>, key: OnyxKey, value: unknown, hasChanged: boolean): void;
 declare function logKeyRemoved(onyxMethod: Extract<OnyxMethod, 'set' | 'merge'>, key: OnyxKey): void;
-/**
- * Getter - returns the callback to state mapping, useful in test environments.
- */
-declare function getCallbackToStateMapping(): Record<number, CallbackToStateMapping<OnyxKey>>;
 /**
  * Clear internal variables used in this file, useful in test environments.
  */
@@ -317,7 +314,6 @@ declare const OnyxUtils: {
     setWithRetry: typeof setWithRetry;
     multiSetWithRetry: typeof multiSetWithRetry;
     setCollectionWithRetry: typeof setCollectionWithRetry;
-    getCallbackToStateMapping: typeof getCallbackToStateMapping;
 };
 export type { OnyxMethod };
 export default OnyxUtils;

package/dist/OnyxUtils.js

@@ -66,6 +66,12 @@ const SQLITE_STORAGE_ERRORS = [
     'database or disk is full', // Device storage is full
 ];
 const STORAGE_ERRORS = [...IDB_STORAGE_ERRORS, ...SQLITE_STORAGE_ERRORS];
+// IndexedDB errors where retrying is futile because the underlying connection/store is broken.
+// The healing path (separate from retryOperation) is responsible for recovery.
+const IDB_NON_RETRIABLE_ERRORS = [
+    'internal error opening backing store', // LevelDB backing store is broken at the filesystem level
+];
+const NON_RETRIABLE_ERRORS = [...IDB_NON_RETRIABLE_ERRORS];
 // Max number of retries for failed storage operations
 const MAX_STORAGE_OPERATION_RETRY_ATTEMPTS = 5;
 // Key/value store of Onyx key and arrays of values to merge
@@ -663,6 +669,7 @@ function reportStorageQuota(error) {
  * Handles storage operation failures based on the error type:
  * - Storage capacity errors: evicts data and retries the operation
  * - Invalid data errors: logs an alert and throws an error
+ * - Non-retriable errors: logs an alert and resolves without retrying
  * - Other errors: retries the operation
  */
 function retryOperation(error, onyxMethod, defaultParams, retryAttempt) {
@@ -677,6 +684,11 @@ function retryOperation(error, onyxMethod, defaultParams, retryAttempt) {
     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);
     const errorName = (_d = (_c = error === null || error === void 0 ? void 0 : error.name) === null || _c === void 0 ? void 0 : _c.toLowerCase) === null || _d === void 0 ? void 0 : _d.call(_c);
     const isStorageCapacityError = STORAGE_ERRORS.some((storageError) => (errorName === null || errorName === void 0 ? void 0 : errorName.includes(storageError)) || (errorMessage === null || errorMessage === void 0 ? void 0 : errorMessage.includes(storageError)));
+    const isNonRetriableError = NON_RETRIABLE_ERRORS.some((nonRetriableError) => (errorName === null || errorName === void 0 ? void 0 : errorName.includes(nonRetriableError)) || (errorMessage === null || errorMessage === void 0 ? void 0 : errorMessage.includes(nonRetriableError)));
+    if (isNonRetriableError) {
+        Logger.logAlert(`Storage operation skipped retry for non-retriable error. Error: ${error}. onyxMethod: ${onyxMethod.name}.`);
+        return Promise.resolve();
+    }
     if (nextRetryAttempt > MAX_STORAGE_OPERATION_RETRY_ATTEMPTS) {
         Logger.logAlert(`Storage operation failed after 5 retries. Error: ${error}. onyxMethod: ${onyxMethod.name}.`);
         return Promise.resolve();
@@ -882,24 +894,6 @@ function subscribeToKey(connectOptions) {
     const subscriptionID = lastSubscriptionID++;
     callbackToStateMapping[subscriptionID] = mapping;
     callbackToStateMapping[subscriptionID].subscriptionID = subscriptionID;
-    // If the subscriber is attempting to connect to a collection member whose ID is skippable (e.g. "undefined", "null", etc.)
-    // we suppress wiring the subscription fully to avoid unnecessary callback emissions such as for "report_undefined".
-    // We still return a valid subscriptionID so callers can disconnect safely.
-    try {
-        const skippableIDs = getSkippableCollectionMemberIDs();
-        if (skippableIDs.size) {
-            const [, collectionMemberID] = OnyxKeys_1.default.splitCollectionMemberKey(mapping.key);
-            if (skippableIDs.has(collectionMemberID)) {
-                // Clean up the provisional mapping to avoid retaining unused subscribers.
-                OnyxCache_1.default.addNullishStorageKey(mapping.key);
-                delete callbackToStateMapping[subscriptionID];
-                return subscriptionID;
-            }
-        }
-    }
-    catch (e) {
-        // Not a collection member key, proceed as usual.
-    }
     // When keyChanged is called, a key is passed and the method looks through all the Subscribers in callbackToStateMapping for the matching key to get the subscriptionID
     // to avoid having to loop through all the Subscribers all the time (even when just one connection belongs to one key),
     // We create a mapping from key to lists of subscriptionIDs to access the specific list of subscriptionIDs.
@@ -1433,12 +1427,6 @@ function logKeyChanged(onyxMethod, key, value, hasChanged) {
 function logKeyRemoved(onyxMethod, key) {
     Logger.logInfo(`${onyxMethod} called for key: ${key} => null passed, so key was removed`);
 }
-/**
- * Getter - returns the callback to state mapping, useful in test environments.
- */
-function getCallbackToStateMapping() {
-    return callbackToStateMapping;
-}
 /**
  * Clear internal variables used in this file, useful in test environments.
  */
@@ -1497,6 +1485,5 @@ const OnyxUtils = {
     setWithRetry,
     multiSetWithRetry,
     setCollectionWithRetry,
-    getCallbackToStateMapping,
 };
 exports.default = OnyxUtils;

package/dist/useOnyx.js

@@ -210,12 +210,8 @@ function useOnyx(key, options, dependencies = []) {
             newValueRef.current = null;
             sourceValueRef.current = undefined;
             resultRef.current = [undefined, { status: 'loading' }];
+            shouldGetCachedValueRef.current = true;
         }
-        // Force a cache re-read on every (re)subscription so any side effects from
-        // subscribeToKey (e.g. addNullishStorageKey for skippable collection member ids)
-        // are reflected in the next getSnapshot. Resetting this flag does not change
-        // resultRef by itself, so it doesn't cause an extra mount render.
-        shouldGetCachedValueRef.current = true;
         hasMountedRef.current = true;
         isConnectingRef.current = true;
         onStoreChangeFnRef.current = onStoreChange;

package/package.json

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