WIP

Author: schmidt-sebastian

packages/firestore/exp/dependencies.json

@@ -25,12 +25,15 @@ import {
 import { handleUserChange, LocalStore } from '../../../src/local/local_store';
 import { Deferred } from '../../../src/util/promise';
 import { logDebug } from '../../../src/util/log';
+import {
+  RemoteStore,
+  remoteStoreHandleCredentialChange
+} from '../../../src/remote/remote_store';
 import {
   SyncEngine,
   syncEngineListen,
   syncEngineUnlisten
 } from '../../../src/core/sync_engine';
-import { RemoteStore } from '../../../src/remote/remote_store';
 import { Persistence } from '../../../src/local/persistence';
 import { EventManager } from '../../../src/core/event_manager';
 export const LOG_TAG = 'ComponentProvider';
@@ -99,7 +102,10 @@ export async function setOnlineComponentProvider(
   firestore._setCredentialChangeListener(user =>
     // TODO(firestoreexp): This should be enqueueRetryable.
     firestore._queue.enqueueAndForget(() =>
-      onlineComponentProvider.remoteStore.handleCredentialChange(user)
+      remoteStoreHandleCredentialChange(
+        onlineComponentProvider.remoteStore,
+        user
+      )
     )
   );
   onlineDeferred.resolve(onlineComponentProvider);

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

@@ -51,14 +51,21 @@ 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';
 import { User } from '../../../src/auth/user';
 import { CredentialChangeListener } from '../../../src/api/credentials';
 import { logDebug } from '../../../src/util/log';
-import { registerPendingWritesCallback } from '../../../src/core/sync_engine';
+import {
+  fillWritePipeline,
+  remoteStoreDisableNetwork,
+  remoteStoreEnableNetwork
+} from '../../../src/remote/remote_store';
+import {
+  ensureWriteCallbacks,
+  registerPendingWritesCallback
+} from '../../../src/core/sync_engine';
 
 const LOG_TAG = 'Firestore';
 
@@ -205,9 +212,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,
@@ -216,9 +228,10 @@ export function enableIndexedDbPersistence(
           settings.cacheSizeBytes || LruParams.DEFAULT_CACHE_SIZE_BYTES,
         forceOwningTab: false
       },
-      new IndexedDbOfflineComponentProvider()
-    )
-  );
+      offlineComponentProvider
+    );
+    await setOnlineComponentProvider(firestoreImpl, onlineComponentProvider);
+  });
 }
 
 export function enableMultiTabIndexedDbPersistence(
@@ -306,7 +319,7 @@ export function enableNetwork(
     const remoteStore = await getRemoteStore(firestoreImpl);
     const persistence = await getPersistence(firestoreImpl);
     persistence.setNetworkEnabled(true);
-    return remoteStore.enableNetwork();
+    return remoteStoreEnableNetwork(remoteStore);
   });
 }
 
@@ -320,7 +333,7 @@ export function disableNetwork(
     const remoteStore = await getRemoteStore(firestoreImpl);
     const persistence = await getPersistence(firestoreImpl);
     persistence.setNetworkEnabled(false);
-    return remoteStore.disableNetwork();
+    return remoteStoreDisableNetwork(remoteStore);
   });
 }
 

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,18 +33,19 @@ import {
   applyPrimaryState,
   applyTargetState,
   getActiveClients,
-  handleCredentialChange,
+  syncEngineHandleCredentialChange,
   newSyncEngine,
-  SyncEngine
+  SyncEngine,
+  ensureWriteCallbacks
 } from './sync_engine';
-import { RemoteStore } from '../remote/remote_store';
 import {
-  EventManager,
-  newEventManager,
-  eventManagerOnOnlineStateChange,
-  eventManagerOnWatchChange,
-  eventManagerOnWatchError
-} from './event_manager';
+  fillWritePipeline,
+  newRemoteStore,
+  RemoteStore,
+  remoteStoreApplyPrimaryState,
+  remoteStoreShutdown
+} from '../remote/remote_store';
+import { EventManager, newEventManager } from './event_manager';
 import { AsyncQueue } from '../util/async_queue';
 import { DatabaseId, DatabaseInfo } from './database_info';
 import { Datastore, newDatastore } from '../remote/datastore';
@@ -69,6 +70,7 @@ import { newConnection, newConnectivityMonitor } from '../platform/connection';
 import { newSerializer } from '../platform/serializer';
 import { getDocument, getWindow } from '../platform/dom';
 import { CredentialsProvider } from '../api/credentials';
+import { getRemoteStore, getSyncEngine } from '../../exp/src/api/components';
 
 const MEMORY_ONLY_PERSISTENCE_ERROR_MESSAGE =
   'You are using the memory-only build of Firestore. Persistence support is ' +
@@ -180,9 +182,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(
@@ -241,16 +255,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) {
@@ -337,17 +344,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(
@@ -356,13 +354,15 @@ export class OnlineComponentProvider {
         OnlineStateSource.SharedClientState
       );
 
-    this.remoteStore.remoteSyncer.handleCredentialChange = handleCredentialChange.bind(
+    this.remoteStore.remoteSyncer.handleCredentialChange = syncEngineHandleCredentialChange.bind(
       null,
       this.syncEngine
     );
 
-    await this.remoteStore.start();
-    await this.remoteStore.applyPrimaryState(this.syncEngine.isPrimaryClient);
+    await remoteStoreApplyPrimaryState(
+      this.remoteStore,
+      this.syncEngine.isPrimaryClient
+    );
   }
 
   createEventManager(cfg: ComponentConfiguration): EventManager {
@@ -376,7 +376,7 @@ export class OnlineComponentProvider {
   }
 
   createRemoteStore(cfg: ComponentConfiguration): RemoteStore {
-    return new RemoteStore(
+    return newRemoteStore(
       this.localStore,
       this.datastore,
       cfg.asyncQueue,
@@ -394,6 +394,7 @@ export class OnlineComponentProvider {
     return newSyncEngine(
       this.localStore,
       this.remoteStore,
+      this.eventManager,
       this.sharedClientState,
       cfg.initialUser,
       cfg.maxConcurrentLimboResolutions,
@@ -403,6 +404,6 @@ export class OnlineComponentProvider {
   }
 
   terminate(): Promise<void> {
-    return this.remoteStore.shutdown();
+    return remoteStoreShutdown(this.remoteStore);
   }
 }

packages/firestore/src/core/component_provider.ts

@@ -28,7 +28,13 @@ import { GarbageCollectionScheduler, Persistence } from '../local/persistence';
 import { Document, NoDocument } from '../model/document';
 import { DocumentKey } from '../model/document_key';
 import { Mutation } from '../model/mutation';
-import { RemoteStore } from '../remote/remote_store';
+import {
+  remoteStoreHandleCredentialChange,
+  RemoteStore,
+  remoteStoreEnableNetwork,
+  remoteStoreDisableNetwork,
+  remoteStoreShutdown
+} from '../remote/remote_store';
 import { AsyncQueue, wrapInUserErrorIfRecoverable } from '../util/async_queue';
 import { Code, FirestoreError } from '../util/error';
 import { logDebug } from '../util/log';
@@ -208,7 +214,7 @@ export class FirestoreClient {
         ).then(this.initializationDone.resolve, this.initializationDone.reject);
       } else {
         this.asyncQueue.enqueueRetryable(() =>
-          this.remoteStore.handleCredentialChange(user)
+          remoteStoreHandleCredentialChange(this.remoteStore, user)
         );
       }
     });
@@ -227,7 +233,7 @@ export class FirestoreClient {
     this.verifyNotTerminated();
     return this.asyncQueue.enqueue(() => {
       this.persistence.setNetworkEnabled(true);
-      return this.remoteStore.enableNetwork();
+      return remoteStoreEnableNetwork(this.remoteStore);
     });
   }
 
@@ -374,7 +380,7 @@ export class FirestoreClient {
     this.verifyNotTerminated();
     return this.asyncQueue.enqueue(() => {
       this.persistence.setNetworkEnabled(false);
-      return this.remoteStore.disableNetwork();
+      return remoteStoreDisableNetwork(this.remoteStore);
     });
   }
 
@@ -388,7 +394,7 @@ export class FirestoreClient {
           this.gcScheduler.stop();
         }
 
-        await this.remoteStore.shutdown();
+        await remoteStoreShutdown(this.remoteStore);
         await this.sharedClientState.shutdown();
         await this.persistence.shutdown();