Reduce diff

Author: schmidt-sebastian

packages/firestore/src/local/indexeddb_persistence.ts

@@ -294,41 +294,40 @@ export class IndexedDbPersistence implements Persistence {
     debugAssert(!this.started, 'IndexedDbPersistence double-started!');
     debugAssert(this.window !== null, "Expected 'window' to be defined");
 
-    try {
-      await this.simpleDb.ensureDb();
-
-      // NOTE: This is expected to fail sometimes (in the case of another tab already
-      // having the persistence lock), so it's the first thing we should do.
-      await this.updateClientMetadataAndTryBecomePrimary();
-
-      if (!this.isPrimary && !this.allowTabSynchronization) {
-        // Fail `start()` if `synchronizeTabs` is disabled and we cannot
-        // obtain the primary lease.
-        throw new FirestoreError(
-          Code.FAILED_PRECONDITION,
-          PRIMARY_LEASE_EXCLUSIVE_ERROR_MSG
-        );
-      }
-      this.attachVisibilityHandler();
-      this.attachWindowUnloadHook();
-
-      this.scheduleClientMetadataAndPrimaryLeaseRefreshes();
-
-      const highestListenSequenceNumber = await this.runTransaction(
-        'getHighestListenSequenceNumber',
-        'readonly',
-        txn => this.targetCache.getHighestSequenceNumber(txn)
-      );
+    return this.updateClientMetadataAndTryBecomePrimary()
+      .then(() => {
+        if (!this.isPrimary && !this.allowTabSynchronization) {
+          // Fail `start()` if `synchronizeTabs` is disabled and we cannot
+          // obtain the primary lease.
+          throw new FirestoreError(
+            Code.FAILED_PRECONDITION,
+            PRIMARY_LEASE_EXCLUSIVE_ERROR_MSG
+          );
+        }
+        this.attachVisibilityHandler();
+        this.attachWindowUnloadHook();
 
-      this.listenSequence = new ListenSequence(
-        highestListenSequenceNumber,
-        this.sequenceNumberSyncer
-      );
+        this.scheduleClientMetadataAndPrimaryLeaseRefreshes();
 
-      this._started = true;
-    } finally {
-      this.simpleDb.close();
-    }
+        return this.runTransaction(
+          'getHighestListenSequenceNumber',
+          'readonly',
+          txn => this.targetCache.getHighestSequenceNumber(txn)
+        );
+      })
+      .then(highestListenSequenceNumber => {
+        this.listenSequence = new ListenSequence(
+          highestListenSequenceNumber,
+          this.sequenceNumberSyncer
+        );
+      })
+      .then(() => {
+        this._started = true;
+      })
+      .catch(reason => {
+        this.simpleDb && this.simpleDb.close();
+        return Promise.reject(reason);
+      });
   }
 
   /**