Tree-Shake RemoteStore Streams (#3568)

Author: schmidt-sebastian

packages/firestore/exp/dependencies.json

@@ -51,7 +51,6 @@ import {
   setOfflineComponentProvider,
   setOnlineComponentProvider
 } from './components';
-
 import { DEFAULT_HOST, DEFAULT_SSL } from '../../../lite/src/api/components';
 import { DatabaseInfo } from '../../../src/core/database_info';
 import { AutoId } from '../../../src/util/misc';
@@ -209,9 +208,14 @@ export function enableIndexedDbPersistence(
   // `getOnlineComponentProvider()`
   const settings = firestoreImpl._getSettings();
 
-  return firestoreImpl._queue.enqueue(() =>
+  const onlineComponentProvider = new OnlineComponentProvider();
+  const offlineComponentProvider = new IndexedDbOfflineComponentProvider(
+    onlineComponentProvider
+  );
+
+  return firestoreImpl._queue.enqueue(async () => {
     // TODO(firestoreexp): Add forceOwningTab
-    setOfflineComponentProvider(
+    await setOfflineComponentProvider(
       firestoreImpl,
       {
         durable: true,
@@ -220,9 +224,10 @@ export function enableIndexedDbPersistence(
           settings.cacheSizeBytes || LruParams.DEFAULT_CACHE_SIZE_BYTES,
         forceOwningTab: false
       },
-      new IndexedDbOfflineComponentProvider()
-    )
-  );
+      offlineComponentProvider
+    );
+    await setOnlineComponentProvider(firestoreImpl, onlineComponentProvider);
+  });
 }
 
 export function enableMultiTabIndexedDbPersistence(

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

@@ -113,12 +113,6 @@ export class Firestore
     removeComponents(this);
     return Promise.resolve();
   }
-
-  // TODO(firestoreexp): `deleteApp()` should call the delete method above,
-  // but it still calls INTERNAL.delete().
-  INTERNAL = {
-    delete: () => this._delete()
-  };
 }
 
 export function initializeFirestore(

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

@@ -33,23 +33,19 @@ import {
   applyPrimaryState,
   applyTargetState,
   getActiveClients,
-  handleCredentialChange,
+  syncEngineHandleCredentialChange,
   newSyncEngine,
-  SyncEngine
+  SyncEngine,
+  ensureWriteCallbacks
 } from './sync_engine';
 import {
+  fillWritePipeline,
   newRemoteStore,
   RemoteStore,
   remoteStoreApplyPrimaryState,
   remoteStoreShutdown
 } from '../remote/remote_store';
-import {
-  EventManager,
-  newEventManager,
-  eventManagerOnOnlineStateChange,
-  eventManagerOnWatchChange,
-  eventManagerOnWatchError
-} 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';
@@ -185,9 +181,21 @@ export class IndexedDbOfflineComponentProvider extends MemoryOfflineComponentPro
   localStore!: LocalStore;
   gcScheduler!: GarbageCollectionScheduler | null;
 
+  constructor(
+    protected readonly onlineComponentProvider: OnlineComponentProvider
+  ) {
+    super();
+  }
+
   async initialize(cfg: ComponentConfiguration): Promise<void> {
     await super.initialize(cfg);
     await synchronizeLastDocumentChangeReadTime(this.localStore);
+
+    await this.onlineComponentProvider.initialize(this, cfg);
+
+    // Enqueue writes from a previous session
+    await ensureWriteCallbacks(this.onlineComponentProvider.syncEngine);
+    await fillWritePipeline(this.onlineComponentProvider.remoteStore);
   }
 
   createGarbageCollectionScheduler(
@@ -246,16 +254,9 @@ export class IndexedDbOfflineComponentProvider extends MemoryOfflineComponentPro
  * `synchronizeTabs` will be enabled.
  */
 export class MultiTabOfflineComponentProvider extends IndexedDbOfflineComponentProvider {
-  constructor(
-    private readonly onlineComponentProvider: OnlineComponentProvider
-  ) {
-    super();
-  }
-
   async initialize(cfg: ComponentConfiguration): Promise<void> {
     await super.initialize(cfg);
 
-    await this.onlineComponentProvider.initialize(this, cfg);
     const syncEngine = this.onlineComponentProvider.syncEngine;
 
     if (this.sharedClientState instanceof WebStorageSharedClientState) {
@@ -342,17 +343,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.subscribe({
-      onWatchChange: eventManagerOnWatchChange.bind(null, this.eventManager),
-      onWatchError: eventManagerOnWatchError.bind(null, this.eventManager),
-      onOnlineStateChange: eventManagerOnOnlineStateChange.bind(
-        null,
-        this.eventManager
-      )
-    });
+    this.syncEngine = this.createSyncEngine(cfg);
 
     this.sharedClientState.onlineStateHandler = onlineState =>
       applyOnlineStateChange(
@@ -361,7 +353,7 @@ export class OnlineComponentProvider {
         OnlineStateSource.SharedClientState
       );
 
-    this.remoteStore.remoteSyncer.handleCredentialChange = handleCredentialChange.bind(
+    this.remoteStore.remoteSyncer.handleCredentialChange = syncEngineHandleCredentialChange.bind(
       null,
       this.syncEngine
     );
@@ -401,6 +393,7 @@ export class OnlineComponentProvider {
     return newSyncEngine(
       this.localStore,
       this.remoteStore,
+      this.eventManager,
       this.sharedClientState,
       cfg.initialUser,
       cfg.maxConcurrentLimboResolutions,