Simplify

Author: schmidt-sebastian

packages/firestore/src/core/component_provider.ts

@@ -48,11 +48,10 @@ import { Code, FirestoreError } from '../util/error';
 import { OnlineStateSource } from './types';
 import { LruParams, LruScheduler } from '../local/lru_garbage_collector';
 import { IndexFreeQueryEngine } from '../local/index_free_query_engine';
-import { MemorySharedClientStateSyncer } from '../local/shared_client_state_syncer';
 import {
-  indexedDbStoragePrefix,
+  indexedDbClearPersistence,
   IndexedDbPersistence,
-  indexedDbClearPersistence
+  indexedDbStoragePrefix
 } from '../local/indexeddb_persistence';
 import {
   MemoryEagerDelegate,
@@ -63,6 +62,7 @@ import { newSerializer } from '../platform/serializer';
 import { getDocument, getWindow } from '../platform/dom';
 import { CredentialsProvider } from '../api/credentials';
 import { Connection } from '../remote/connection';
+
 const MEMORY_ONLY_PERSISTENCE_ERROR_MESSAGE =
   'You are using the memory-only build of Firestore. Persistence support is ' +
   'only available via the @firebase/firestore bundle or the ' +
@@ -198,7 +198,7 @@ export class MemoryComponentProvider implements ComponentProvider {
   }
 
   createSyncEngine(cfg: ComponentConfiguration): SyncEngine {
-    const syncEngine = newSyncEngine(
+    return newSyncEngine(
       this.localStore,
       this.remoteStore,
       this.datastore,
@@ -207,10 +207,6 @@ export class MemoryComponentProvider implements ComponentProvider {
       cfg.maxConcurrentLimboResolutions,
       /* isPrimary= */ true
     );
-    this.sharedClientState.syncEngine = new MemorySharedClientStateSyncer([
-      cfg.clientId
-    ]);
-    return syncEngine;
   }
 
   clearPersistence(
@@ -330,12 +326,17 @@ export class MultiTabIndexedDbComponentProvider extends IndexedDbComponentProvid
       cfg.maxConcurrentLimboResolutions,
       startsAsPrimary
     );
-    this.sharedClientState.syncEngine = {
-      applyBatchState: applyBatchState.bind(null, syncEngine),
-      applyTargetState: applyTargetState.bind(null, syncEngine),
-      applyActiveTargetsChange: applyActiveTargetsChange.bind(null, syncEngine),
-      getActiveClients: getActiveClients.bind(null, syncEngine)
-    };
+    if (this.sharedClientState instanceof WebStorageSharedClientState) {
+      this.sharedClientState.syncEngine = {
+        applyBatchState: applyBatchState.bind(null, syncEngine),
+        applyTargetState: applyTargetState.bind(null, syncEngine),
+        applyActiveTargetsChange: applyActiveTargetsChange.bind(
+          null,
+          syncEngine
+        ),
+        getActiveClients: getActiveClients.bind(null, syncEngine)
+      };
+    }
     return syncEngine;
   }
 

packages/firestore/src/core/sync_engine.ts

@@ -21,7 +21,7 @@ import {
   getCachedTarget,
   ignoreIfPrimaryLeaseLoss,
   LocalStore,
-  getCurrentlyActiveClients,
+  getActiveClientsFromPersistence,
   lookupMutationDocuments,
   removeCachedMutationBatchMetadata
 } from '../local/local_store';
@@ -1234,7 +1234,7 @@ function synthesizeTargetToQuery(target: Target): Query {
 // PORTING NOTE: Multi-Tab only.
 export function getActiveClients(syncEngine: SyncEngine): Promise<ClientId[]> {
   const syncEngineImpl = debugCast(syncEngine, SyncEngineImpl);
-  return getCurrentlyActiveClients(syncEngineImpl.localStore);
+  return getActiveClientsFromPersistence(syncEngineImpl.localStore);
 }
 
 /** Applies a query target change from a different tab. */

packages/firestore/src/local/local_store.ts

@@ -1090,7 +1090,7 @@ export function removeCachedMutationBatchMetadata(
 }
 
 // PORTING NOTE: Multi-Tab only.
-export function getCurrentlyActiveClients(
+export function getActiveClientsFromPersistence(
   localStore: LocalStore
 ): Promise<ClientId[]> {
   const persistenceImpl = debugCast(

packages/firestore/src/local/shared_client_state.ts

@@ -75,7 +75,6 @@ export type ClientId = string;
  * assigned before calling `start()`.
  */
 export interface SharedClientState {
-  syncEngine: SharedClientStateSyncer | null;
   onlineStateHandler: ((onlineState: OnlineState) => void) | null;
   sequenceNumberHandler:
     | ((sequenceNumber: ListenSequenceNumber) => void)
@@ -1059,8 +1058,6 @@ function fromWebStorageSequenceNumber(
 export class MemorySharedClientState implements SharedClientState {
   private localState = new LocalClientState();
   private queryState: { [targetId: number]: QueryTargetState } = {};
-
-  syncEngine: SharedClientStateSyncer | null = null;
   onlineStateHandler: ((onlineState: OnlineState) => void) | null = null;
   sequenceNumberHandler:
     | ((sequenceNumber: ListenSequenceNumber) => void)

packages/firestore/test/unit/local/persistence_test_helpers.ts

@@ -41,7 +41,6 @@ import {
   ClientId,
   WebStorageSharedClientState
 } from '../../../src/local/shared_client_state';
-import { MemorySharedClientStateSyncer } from '../../../src/local/shared_client_state_syncer';
 import { SimpleDb } from '../../../src/local/simple_db';
 import { JsonProtoSerializer } from '../../../src/remote/serializer';
 import { AsyncQueue } from '../../../src/util/async_queue';
@@ -156,13 +155,6 @@ export async function populateWebStorage(
     existingClientId,
     user
   );
-
-  secondaryClientState.syncEngine = new MemorySharedClientStateSyncer([
-    existingClientId
-  ]);
-  secondaryClientState.onlineStateHandler = () => {};
-  await secondaryClientState.start();
-
   for (const batchId of existingMutationBatchIds) {
     secondaryClientState.addPendingMutation(batchId);
   }

packages/firestore/test/unit/local/web_storage_shared_client_state.test.ts

@@ -32,10 +32,6 @@ import {
   SharedClientState,
   WebStorageSharedClientState
 } from '../../../src/local/shared_client_state';
-import {
-  QueryTargetState,
-  SharedClientStateSyncer
-} from '../../../src/local/shared_client_state_syncer';
 import { targetIdSet } from '../../../src/model/collections';
 import { AsyncQueue } from '../../../src/util/async_queue';
 import { FirestoreError } from '../../../src/util/error';
@@ -48,6 +44,7 @@ import {
 } from './persistence_test_helpers';
 import { testWindow } from '../../util/test_platform';
 import { WindowLike } from '../../../src/util/types';
+import { QueryTargetState } from '../../../src/local/shared_client_state_syncer';
 
 /* eslint-disable no-restricted-globals */
 
@@ -91,7 +88,7 @@ interface TestSharedClientState {
  * Implementation of `SharedClientStateSyncer` that aggregates its callback
  * data and exposes it via `.sharedClientState`.
  */
-class TestSharedClientSyncer implements SharedClientStateSyncer {
+class TestSharedClientSyncer {
   private mutationState: {
     [batchId: number]: { state: MutationBatchState; error?: FirestoreError };
   } = {};
@@ -215,7 +212,6 @@ describe('WebStorageSharedClientState', () => {
       AUTHENTICATED_USER
     );
     clientSyncer = new TestSharedClientSyncer([primaryClientId]);
-    sharedClientState.syncEngine = clientSyncer;
     sharedClientState.onlineStateHandler = clientSyncer.applyOnlineStateChange.bind(
       clientSyncer
     );