Clean up isPrimary

Author: schmidt-sebastian

packages/firestore/src/core/sync_engine.ts

@@ -918,10 +918,7 @@ export class SyncEngine implements RemoteSyncer {
 // PORTING NOTE: Web only
 export class MultiTabSyncEngine extends SyncEngine
   implements SharedClientStateSyncer {
-  // The primary state is set to `true` or `false` immediately after Firestore
-  // startup. In the interim, a client should only be considered primary if
-  // `isPrimary` is true.
-  private isPrimary: undefined | boolean = undefined;
+  isPrimaryClient = false;
 
   constructor(
     protected localStore: MultiTabLocalStore,
@@ -939,10 +936,6 @@ export class MultiTabSyncEngine extends SyncEngine
     );
   }
 
-  get isPrimaryClient(): boolean {
-    return this.isPrimary === true;
-  }
-
   enableNetwork(): Promise<void> {
     this.localStore.setNetworkEnabled(true);
     return super.enableNetwork();
@@ -967,7 +960,7 @@ export class MultiTabSyncEngine extends SyncEngine
     const viewSnapshot = queryView.view.synchronizeWithPersistedState(
       queryResult
     );
-    if (this.isPrimary) {
+    if (this.isPrimaryClient) {
       this.updateTrackedLimbos(queryView.targetId, viewSnapshot.limboChanges);
     }
     return viewSnapshot;
@@ -1034,7 +1027,7 @@ export class MultiTabSyncEngine extends SyncEngine
   }
 
   async applyPrimaryState(isPrimary: boolean): Promise<void> {
-    if (isPrimary === true && this.isPrimary !== true) {
+    if (isPrimary === true && this.isPrimaryClient !== true) {
       // Secondary tabs only maintain Views for their local listeners and the
       // Views internal state may not be 100% populated (in particular
       // secondary tabs don't track syncedDocuments, the set of documents the
@@ -1046,12 +1039,12 @@ export class MultiTabSyncEngine extends SyncEngine
         activeTargets.toArray(),
         /*transitionToPrimary=*/ true
       );
-      this.isPrimary = true;
+      this.isPrimaryClient = true;
       await this.remoteStore.applyPrimaryState(true);
       for (const targetData of activeQueries) {
         this.remoteStore.listen(targetData);
       }
-    } else if (isPrimary === false && this.isPrimary !== false) {
+    } else if (isPrimary === false && this.isPrimaryClient !== false) {
       const activeTargets: TargetId[] = [];
 
       let p = Promise.resolve();
@@ -1076,7 +1069,7 @@ export class MultiTabSyncEngine extends SyncEngine
         /*transitionToPrimary=*/ false
       );
       this.resetLimboDocuments();
-      this.isPrimary = false;
+      this.isPrimaryClient = false;
       await this.remoteStore.applyPrimaryState(false);
     }
   }
@@ -1191,7 +1184,7 @@ export class MultiTabSyncEngine extends SyncEngine
     state: QueryTargetState,
     error?: FirestoreError
   ): Promise<void> {
-    if (this.isPrimary) {
+    if (this.isPrimaryClient) {
       // If we receive a target state notification via WebStorage, we are
       // either already secondary or another tab has taken the primary lease.
       logDebug(LOG_TAG, 'Ignoring unexpected query state notification.');
@@ -1231,7 +1224,7 @@ export class MultiTabSyncEngine extends SyncEngine
     added: TargetId[],
     removed: TargetId[]
   ): Promise<void> {
-    if (!this.isPrimary) {
+    if (!this.isPrimaryClient) {
       return;
     }