react-native-onyx 3.0.56 → 3.0.57

package/dist/storage/providers/IDBKeyValProvider/createStore.js

@@ -34,25 +34,39 @@ var __importStar = (this && this.__importStar) || (function () {
 })();
 Object.defineProperty(exports, "__esModule", { value: true });
 const IDB = __importStar(require("idb-keyval"));
-const Logger_1 = require("../../../Logger");
+const Logger = __importStar(require("../../../Logger"));
 // This is a copy of the createStore function from idb-keyval, we need a custom implementation
 // because we need to create the database manually in order to ensure that the store exists before we use it.
 // If the store does not exist, idb-keyval will throw an error
 // source: https://github.com/jakearchibald/idb-keyval/blob/9d19315b4a83897df1e0193dccdc29f78466a0f3/src/index.ts#L12
 function createStore(dbName, storeName) {
     let dbp;
+    const attachHandlers = (db) => {
+        // Browsers may close idle IDB connections at any time, especially Safari.
+        // We clear the cached promise so the next operation opens a fresh connection.
+        // https://developer.mozilla.org/en-US/docs/Web/API/IDBDatabase/close_event
+        // eslint-disable-next-line no-param-reassign
+        db.onclose = () => {
+            Logger.logInfo('IDB connection closed by browser', { dbName, storeName });
+            dbp = undefined;
+        };
+        // When another tab triggers a DB version upgrade, we must close the connection
+        // to unblock the upgrade; otherwise the other tab's open request hangs indefinitely.
+        // https://developer.mozilla.org/en-US/docs/Web/API/IDBDatabase/versionchange_event
+        // eslint-disable-next-line no-param-reassign
+        db.onversionchange = () => {
+            Logger.logInfo('IDB connection closing due to version change', { dbName, storeName });
+            db.close();
+            dbp = undefined;
+        };
+    };
     const getDB = () => {
         if (dbp)
             return dbp;
         const request = indexedDB.open(dbName);
         request.onupgradeneeded = () => request.result.createObjectStore(storeName);
         dbp = IDB.promisifyRequest(request);
-        dbp.then((db) => {
-            // It seems like Safari sometimes likes to just close the connection.
-            // It's supposed to fire this event when that happens. Let's hope it does!
-            // eslint-disable-next-line no-param-reassign
-            db.onclose = () => (dbp = undefined);
-        }, 
+        dbp.then(attachHandlers, 
         // eslint-disable-next-line @typescript-eslint/no-empty-function
         () => { });
         return dbp;
@@ -63,7 +77,7 @@ function createStore(dbName, storeName) {
         if (db.objectStoreNames.contains(storeName)) {
             return db;
         }
-        (0, Logger_1.logInfo)(`Store ${storeName} does not exist in database ${dbName}.`);
+        Logger.logInfo(`Store ${storeName} does not exist in database ${dbName}.`);
         const nextVersion = db.version + 1;
         db.close();
         const request = indexedDB.open(dbName, nextVersion);
@@ -72,14 +86,34 @@ function createStore(dbName, storeName) {
             if (updatedDatabase.objectStoreNames.contains(storeName)) {
                 return;
             }
-            (0, Logger_1.logInfo)(`Creating store ${storeName} in database ${dbName}.`);
+            Logger.logInfo(`Creating store ${storeName} in database ${dbName}.`);
             updatedDatabase.createObjectStore(storeName);
         };
         dbp = IDB.promisifyRequest(request);
+        // eslint-disable-next-line @typescript-eslint/no-empty-function
+        dbp.then(attachHandlers, () => { });
         return dbp;
     };
-    return (txMode, callback) => getDB()
-        .then(verifyStoreExists)
-        .then((db) => callback(db.transaction(storeName, txMode).objectStore(storeName)));
+    function executeTransaction(txMode, callback) {
+        return getDB()
+            .then(verifyStoreExists)
+            .then((db) => callback(db.transaction(storeName, txMode).objectStore(storeName)));
+    }
+    // If the connection was closed between getDB() resolving and db.transaction() executing,
+    // the transaction throws InvalidStateError. We catch it and retry once with a fresh connection.
+    return (txMode, callback) => executeTransaction(txMode, callback).catch((error) => {
+        if (error instanceof DOMException && error.name === 'InvalidStateError') {
+            Logger.logAlert('IDB InvalidStateError, retrying with fresh connection', {
+                dbName,
+                storeName,
+                txMode,
+                errorMessage: error.message,
+            });
+            dbp = undefined;
+            // Retry only once — this call is not wrapped, so if it also fails the error propagates normally.
+            return executeTransaction(txMode, callback);
+        }
+        throw error;
+    });
 }
 exports.default = createStore;

package/package.json

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