Merge EventManager PR

Author: schmidt-sebastian

packages/firestore/exp/dependencies.json

@@ -23,14 +23,18 @@ import {
   OfflineComponentProvider,
   OnlineComponentProvider
 } from '../../../src/core/component_provider';
-import {handleUserChange, LocalStore} from '../../../src/local/local_store';
+import { handleUserChange, LocalStore } from '../../../src/local/local_store';
 import { Deferred } from '../../../src/util/promise';
 import { logDebug } from '../../../src/util/log';
-import { SyncEngine } from '../../../src/core/sync_engine';
 import {
   RemoteStore,
   remoteStoreHandleCredentialChange
 } from '../../../src/remote/remote_store';
+import {
+  SyncEngine,
+  syncEngineListen,
+  syncEngineUnlisten
+} from '../../../src/core/sync_engine';
 import { Persistence } from '../../../src/local/persistence';
 import { EventManager } from '../../../src/core/event_manager';
 export const LOG_TAG = 'ComponentProvider';
@@ -98,7 +102,10 @@ export async function setOnlineComponentProvider(
   // precedence over the offline component provider.
   firestore._setCredentialChangeListener(user =>
     firestore._queue.enqueueAndForget(() =>
-      remoteStoreHandleCredentialChange(onlineComponentProvider.remoteStore, user)
+      remoteStoreHandleCredentialChange(
+        onlineComponentProvider.remoteStore,
+        user
+      )
     )
   );
   onlineDeferred.resolve(onlineComponentProvider);
@@ -156,9 +163,14 @@ export function getRemoteStore(firestore: Firestore): Promise<RemoteStore> {
 }
 
 export function getEventManager(firestore: Firestore): Promise<EventManager> {
-  return getOnlineComponentProvider(firestore).then(
-    components => components.eventManager
-  );
+  return getOnlineComponentProvider(firestore).then(components => {
+    const eventManager = components.eventManager;
+    eventManager.subscribe(
+      syncEngineListen.bind(null, components.syncEngine),
+      syncEngineUnlisten.bind(null, components.syncEngine)
+    );
+    return eventManager;
+  });
 }
 
 export function getPersistence(firestore: Firestore): Promise<Persistence> {

packages/firestore/exp/src/api/components.ts

@@ -201,22 +201,24 @@ export function enableIndexedDbPersistence(
   const onlineComponentProvider = new OnlineComponentProvider();
 
   // TODO(firestoreexp): Add forceOwningTab
-  return setOfflineComponentProvider(
-    firestoreImpl,
-    {
-      durable: true,
-      synchronizeTabs: false,
-      cacheSizeBytes:
-        settings.cacheSizeBytes || LruParams.DEFAULT_CACHE_SIZE_BYTES,
-      forceOwningTab: false
-    },
-    new IndexedDbOfflineComponentProvider()
-  )
-    .then(() =>
-      setOnlineComponentProvider(firestoreImpl, new OnlineComponentProvider())
+  return (
+    setOfflineComponentProvider(
+      firestoreImpl,
+      {
+        durable: true,
+        synchronizeTabs: false,
+        cacheSizeBytes:
+          settings.cacheSizeBytes || LruParams.DEFAULT_CACHE_SIZE_BYTES,
+        forceOwningTab: false
+      },
+      new IndexedDbOfflineComponentProvider()
     )
-    // Enqueue writes from a previous session
-    .then(() => fillWritePipeline(onlineComponentProvider.remoteStore));
+      .then(() =>
+        setOnlineComponentProvider(firestoreImpl, new OnlineComponentProvider())
+      )
+      // Enqueue writes from a previous session
+      .then(() => fillWritePipeline(onlineComponentProvider.remoteStore))
+  );
 }
 
 export function enableMultiTabIndexedDbPersistence(
@@ -235,22 +237,24 @@ export function enableMultiTabIndexedDbPersistence(
   const offlineComponentProvider = new MultiTabOfflineComponentProvider(
     onlineComponentProvider
   );
-  return setOfflineComponentProvider(
-    firestoreImpl,
-    {
-      durable: true,
-      synchronizeTabs: true,
-      cacheSizeBytes:
-        settings.cacheSizeBytes || LruParams.DEFAULT_CACHE_SIZE_BYTES,
-      forceOwningTab: false
-    },
-    offlineComponentProvider
-  )
-    .then(() =>
-      setOnlineComponentProvider(firestoreImpl, onlineComponentProvider)
+  return (
+    setOfflineComponentProvider(
+      firestoreImpl,
+      {
+        durable: true,
+        synchronizeTabs: true,
+        cacheSizeBytes:
+          settings.cacheSizeBytes || LruParams.DEFAULT_CACHE_SIZE_BYTES,
+        forceOwningTab: false
+      },
+      offlineComponentProvider
     )
-    // Enqueue writes from a previous session
-    .then(() => fillWritePipeline(onlineComponentProvider.remoteStore));
+      .then(() =>
+        setOnlineComponentProvider(firestoreImpl, onlineComponentProvider)
+      )
+      // Enqueue writes from a previous session
+      .then(() => fillWritePipeline(onlineComponentProvider.remoteStore))
+  );
 }
 
 export function clearIndexedDbPersistence(

packages/firestore/exp/src/api/database.ts

@@ -40,9 +40,10 @@ import {
 import {
   newRemoteStore,
   RemoteStore,
-  remoteStoreApplyPrimaryState, remoteStoreShutdown
+  remoteStoreApplyPrimaryState,
+  remoteStoreShutdown
 } from '../remote/remote_store';
-import { EventManager } from './event_manager';
+import { EventManager, newEventManager } from './event_manager';
 import { AsyncQueue } from '../util/async_queue';
 import { DatabaseId, DatabaseInfo } from './database_info';
 import { Datastore, newDatastore } from '../remote/datastore';
@@ -335,8 +336,8 @@ export class OnlineComponentProvider {
     this.sharedClientState = offlineComponentProvider.sharedClientState;
     this.datastore = this.createDatastore(cfg);
     this.remoteStore = this.createRemoteStore(cfg);
-    this.syncEngine = this.createSyncEngine(cfg);
     this.eventManager = this.createEventManager(cfg);
+    this.syncEngine = this.createSyncEngine(cfg);
 
     this.sharedClientState.onlineStateHandler = onlineState =>
       applyOnlineStateChange(
@@ -350,11 +351,14 @@ export class OnlineComponentProvider {
       this.syncEngine
     );
 
-    await remoteStoreApplyPrimaryState(this.remoteStore, this.syncEngine.isPrimaryClient);
+    await remoteStoreApplyPrimaryState(
+      this.remoteStore,
+      this.syncEngine.isPrimaryClient
+    );
   }
 
   createEventManager(cfg: ComponentConfiguration): EventManager {
-    return new EventManager(this.syncEngine);
+    return newEventManager();
   }
 
   createDatastore(cfg: ComponentConfiguration): Datastore {
@@ -382,6 +386,7 @@ export class OnlineComponentProvider {
     return newSyncEngine(
       this.localStore,
       this.remoteStore,
+      this.eventManager,
       this.sharedClientState,
       cfg.initialUser,
       cfg.maxConcurrentLimboResolutions,