Cleanup

Author: schmidt-sebastian

packages/firestore/src/local/indexeddb_persistence.ts

@@ -59,7 +59,7 @@ const LOG_TAG = 'IndexedDbPersistence';
 const CLIENT_METADATA_MAX_AGE_MS = 5000;
 /**
  * The maximum interval after which clients will update their metadata,
- * including refreshing the primary lease if held or potentially trying to
+ * including refreshing their primary lease if held or potentially trying to
  * acquire it if not held.
  *
  * Primary clients may opportunistically refresh their metadata earlier
@@ -302,8 +302,8 @@ export class IndexedDbPersistence implements Persistence {
    * Evaluate the state of all active instances and determine whether the local
    * client is or can act as the holder of the primary lease. Returns whether
    * the client is eligible for the lease, but does not actually acquire it.
-   * May return 'false' even if there is no active leaseholder when a foreground
-   * client should become leaseholder instead.
+   * May return 'false' even if there is no active leaseholder if another
+   * (foreground) client should become leaseholder instead.
    */
   private canActAsPrimary(
     currentPrimary: DbOwner | null,
@@ -313,12 +313,12 @@ 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.
+    let canActAsPrimary = this.inForeground;
+
     return PersistencePromise.resolve()
       .next(() => {
         if (!canActAsPrimary) {
@@ -348,9 +348,7 @@ export class IndexedDbPersistence implements Persistence {
   }
 
   shutdown(): Promise<void> {
-    if (!this.started) {
-      return Promise.resolve();
-    }
+    assert(this.started, 'IndexedDbPersistence shutdown without start!');
     this.started = false;
     this.detachVisibilityHandler();
     this.detachWindowUnloadHook();

packages/firestore/src/local/indexeddb_schema.ts

@@ -547,11 +547,11 @@ export class DbClientMetadata {
   static store = 'clientMetadata';
 
   /** Keys are automatically assigned via the clientId properties. */
-  static keyPath = ['clientId'];
+  static keyPath = ['clientKey'];
 
   constructor(
     /** The auto-generated client id assigned at client startup. */
-    public clientId: string,
+    public clientKey: string,
     /** The last time this state was updated. */
     public updateTimeMs: number,
     /** Whether this client is running in a foreground tab. */

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

@@ -793,8 +793,8 @@ abstract class TestRunner {
   }
 
   private async doAcquirePrimaryLease(): Promise<void> {
-    // We drain the queue after running the client metadata refresh task as teh
-    // refresh might schedule the primary state callback on the queue as well.
+    // We drain the queue after running the client metadata refresh task as the
+    // refresh might schedule a primary state callback on the queue as well.
     return this.queue
       .runDelayedOperationsEarly(TimerId.ClientMetadataRefresh)
       .then(() => this.queue.drain());