fixups

Author: wu-hui

packages/firestore/src/api/cache_config.ts

@@ -38,6 +38,10 @@ class MemoryLocalCacheImpl implements MemoryLocalCache {
     this._onlineComponentProvider = new OnlineComponentProvider();
     this._offlineComponentProvider = new MemoryOfflineComponentProvider();
   }
+
+  toJSON() {
+    return { kind: this.kind };
+  }
 }
 
 export interface IndexedDbLocalCache {
@@ -54,15 +58,19 @@ class IndexedDbLocalCacheImpl implements IndexedDbLocalCache {
   constructor(settings: IndexedDbSettings | undefined) {
     let tabManager: IndexedDbTabManager;
     if (settings?.tabManager) {
-      settings.tabManager.initialize(settings);
+      settings.tabManager._initialize(settings);
       tabManager = settings.tabManager;
     } else {
       tabManager = indexedDbSingleTabManager(undefined);
-      tabManager.initialize(settings);
+      tabManager._initialize(settings);
     }
     this._onlineComponentProvider = tabManager._onlineComponentProvider!;
     this._offlineComponentProvider = tabManager._offlineComponentProvider!;
   }
+
+  toJSON() {
+    return { kind: this.kind };
+  }
 }
 
 export type FirestoreLocalCache = MemoryLocalCache | IndexedDbLocalCache;
@@ -87,7 +95,7 @@ export function indexedDbLocalCache(
 
 export interface IndexedDbSingleTabManager {
   kind: 'indexedDbSingleTab';
-  initialize: (
+  _initialize: (
     settings: Omit<IndexedDbSettings, 'tabManager'> | undefined
   ) => void;
   _onlineComponentProvider?: OnlineComponentProvider;
@@ -102,7 +110,11 @@ class SingleTabManagerImpl implements IndexedDbSingleTabManager {
 
   constructor(private forceOwnership?: boolean) {}
 
-  initialize(
+  toJSON() {
+    return { kind: this.kind };
+  }
+
+  _initialize(
     settings: Omit<IndexedDbSettings, 'tabManager'> | undefined
   ): void {
     this._onlineComponentProvider = new OnlineComponentProvider();
@@ -116,7 +128,7 @@ class SingleTabManagerImpl implements IndexedDbSingleTabManager {
 
 export interface IndexedDbMultipleTabManager {
   kind: 'IndexedDbMultipleTab';
-  initialize: (settings: Omit<IndexedDbSettings, 'tabManager'>) => void;
+  _initialize: (settings: Omit<IndexedDbSettings, 'tabManager'>) => void;
   _onlineComponentProvider?: OnlineComponentProvider;
   _offlineComponentProvider?: OfflineComponentProvider;
 }
@@ -127,7 +139,11 @@ class MultiTabManagerImpl implements IndexedDbMultipleTabManager {
   _onlineComponentProvider?: OnlineComponentProvider;
   _offlineComponentProvider?: OfflineComponentProvider;
 
-  initialize(
+  toJSON() {
+    return { kind: this.kind };
+  }
+
+  _initialize(
     settings: Omit<IndexedDbSettings, 'tabManager'> | undefined
   ): void {
     this._onlineComponentProvider = new OnlineComponentProvider();

packages/firestore/src/core/firestore_client.ts

@@ -124,12 +124,12 @@ export class FirestoreClient {
     private authCredentials: CredentialsProvider<User>,
     private appCheckCredentials: CredentialsProvider<string>,
     /**
-     * Asynchronous queue responsible for all of our internal processing. When //
-     * we get incoming work from the user (via public API) or the network //
-     * (incoming GRPC messages), we should always schedule onto this queue. //
-     * This ensures all of our work is properly serialized (e.g. we don't //
-     * start processing a new operation while the previous one is waiting for //
-     * an async I/O to complete). //
+     * Asynchronous queue responsible for all of our internal processing. When
+     * we get incoming work from the user (via public API) or the network
+     * (incoming GRPC messages), we should always schedule onto this queue.
+     * This ensures all of our work is properly serialized (e.g. we don't
+     * start processing a new operation while the previous one is waiting for
+     * an async I/O to complete).
      */
     public asyncQueue: AsyncQueue,
     private databaseInfo: DatabaseInfo

packages/firestore/src/lite-api/settings.ts

@@ -110,11 +110,11 @@ export class FirestoreSettingsImpl {
 
     this.credentials = settings.credentials;
     this.ignoreUndefinedProperties = !!settings.ignoreUndefinedProperties;
-    logWarn(
-      `Setting offline cache to ${JSON.stringify(
-        settings
-      )} from PrivateSettings`
-    );
+    // logWarn(
+    //   `Setting offline cache to ${JSON.stringify(
+    //     settings.cache
+    //   )} from PrivateSettings`
+    // );
     this.cache = settings.cache;
 
     if (settings.cacheSizeBytes === undefined) {

packages/firestore/test/integration/api_internal/idle_timeout.test.ts

@@ -22,7 +22,7 @@ import { apiDescribe, withTestDb } from '../util/helpers';
 import { asyncQueue } from '../util/internal_helpers';
 
 apiDescribe('Idle Timeout', (persistence: boolean) => {
-  it('can write document after idle timeout', () => {
+  it.only('can write document after idle timeout', () => {
     return withTestDb(persistence, db => {
       const docRef = doc(collection(db, 'test-collection'));
       return setDoc(docRef, { foo: 'bar' })

packages/firestore/test/integration/util/helpers.ts

@@ -17,7 +17,10 @@
 
 import { isIndexedDBAvailable } from '@firebase/util';
 
-import { indexedDbLocalCache } from '../../../src/api/cache_config';
+import {
+  indexedDbLocalCache,
+  memoryLocalCache
+} from '../../../src/api/cache_config';
 import { logWarn } from '../../../src/util/log';
 
 import {
@@ -187,7 +190,7 @@ export async function withTestDbsSettings(
   const dbs: Firestore[] = [];
 
   for (let i = 0; i < numDbs; i++) {
-    logWarn(`set persistence from helper: ${persistence}`);
+    // logWarn(`set persistence from helper: ${persistence}`);
     if (persistence) {
       settings.cache = indexedDbLocalCache();
     }