Cleanup for canActAsPrimary

Author: schmidt-sebastian

packages/firestore/src/local/indexeddb_persistence.ts

@@ -229,26 +229,23 @@ export class IndexedDbPersistence implements Persistence {
               );
             }
 
-            if (currentPrimary != null) {
-              if (this.isPrimary) {
-                // If we are the primary lease holder, we refresh the client
-                // metadata and the primary lease after the default interval.
-                return this.acquireOrExtendPrimaryLease(txn).next(
-                  () => CLIENT_METADATA_REFRESH_INTERVAL_MS
-                );
-              } else {
-                // If another client currently holds the lease, we use a custom
-                // refresh interval and schedule a lease refresh immediately after
-                // the current lease is expected to expire.
-                const remainingLifetimeMs =
-                  Date.now() -
-                  (currentPrimary.leaseTimestampMs +
-                    CLIENT_METADATA_MAX_AGE_MS);
-                return Math.min(
-                  MINIMUM_REFRESH_INTERVAL_MS,
-                  remainingLifetimeMs + 1
-                );
-              }
+            if (this.isPrimary) {
+              // If we are the primary lease holder, we refresh the client
+              // metadata and the primary lease after the default interval.
+              return this.acquireOrExtendPrimaryLease(txn).next(
+                () => CLIENT_METADATA_REFRESH_INTERVAL_MS
+              );
+            } else if (currentPrimary != null) {
+              // If another client currently holds the lease, we use a custom
+              // refresh interval and schedule a lease refresh immediately after
+              // the current lease is expected to expire.
+              const remainingLifetimeMs =
+                Date.now() -
+                (currentPrimary.leaseTimestampMs + CLIENT_METADATA_MAX_AGE_MS);
+              return Math.min(
+                MINIMUM_REFRESH_INTERVAL_MS,
+                remainingLifetimeMs + 1
+              );
             } else {
               // If there is no current leaseholder, but we are not ourselves
               // eligible to directly obtain the lease (based on our foreground
@@ -316,20 +313,17 @@ export class IndexedDbPersistence implements Persistence {
       return PersistencePromise.resolve(this.isLocalClient(currentPrimary));
     }
 
+    let canActAsPrimary = this.inForeground;
+
     // Check if this client is eligible for a primary lease based on its
     // visibility state and the visibility state of all active clients. A
     // client can obtain the primary lease if it is either in the foreground
     // or if this client and all other clients are in the background.
-    return PersistencePromise.resolve(true)
+    return PersistencePromise.resolve()
       .next(() => {
-        if (this.inForeground) {
-          return true;
-        }
-
-        let canActAsPrimary = true;
-
-        return clientMetadataStore(txn)
-          .iterate((key, value, control) => {
+        if (!canActAsPrimary) {
+          canActAsPrimary = true;
+          return clientMetadataStore(txn).iterate((key, value, control) => {
             if (this.clientKey !== value.clientId) {
               if (
                 this.isWithinMaxAge(value.updateTimeMs) &&
@@ -339,12 +333,10 @@ export class IndexedDbPersistence implements Persistence {
                 control.done();
               }
             }
-          })
-          .next(() => {
-            return canActAsPrimary;
           });
+        }
       })
-      .next(canActAsPrimary => {
+      .next(() => {
         log.debug(
           LOG_TAG,
           `Client ${

packages/firestore/test/unit/specs/spec_test_runner.ts

@@ -1169,11 +1169,19 @@ export async function runSpec(
     }
     await runners[i].start();
   }
+  let lastStep = null;
+  let count = 0;
   try {
-    let stepcnt = 0;
     await sequence(steps, async step => {
+      ++count;
+      lastStep = step;
       return runners[step.clientIndex || 0].run(step);
     });
+  } catch (err) {
+    console.warn(
+      `Spec test failed at step ${count}: ${JSON.stringify(lastStep)}`
+    );
+    throw err;
   } finally {
     for (const runner of runners) {
       await runner.shutdown();