WIP

Author: maneesht

packages/data-connect/src/api/DataConnect.ts

@@ -30,7 +30,9 @@ import {
   updateEmulatorBanner
 } from '@firebase/util';
 
-import { CacheSettings, DataConnectCache, InMemoryCacheProvider } from '../cache/Cache';
+import { DataConnectCache, InMemoryCacheProvider } from '../cache/Cache';
+import { CacheProvider } from '../cache/CacheProvider';
+import { IndexedDBCacheProvider } from '../cache/IndexedDBCacheProvider';
 import { AppCheckTokenProvider } from '../core/AppCheckTokenProvider';
 import { Code, DataConnectError } from '../core/error';
 import {
@@ -49,8 +51,6 @@ import { RESTTransport } from '../network/transport/rest';
 import { PROD_HOST } from '../util/url';
 
 import { MutationManager } from './Mutation';
-import { IndexedDBCacheProvider } from '../cache/IndexedDBCacheProvider';
-import { CacheProvider } from '../cache/CacheProvider';
 
 /**
  * Connector Config for calling Data Connect backend.
@@ -268,7 +268,7 @@ export function connectDataConnectEmulator(
 
 export type CacheProviderImpl = PublicIndexedDbProvider | PublicEphemeralDbProvider;
 
-class PublicIndexedDbProvider {
+export class PublicIndexedDbProvider {
 
   /**
    * @internal
@@ -278,7 +278,7 @@ class PublicIndexedDbProvider {
   }
 }
 
-class PublicEphemeralDbProvider {
+export class PublicEphemeralDbProvider {
   /**
    * @internal
    */

packages/data-connect/src/cache/Cache.ts

@@ -1,6 +1,6 @@
 import { isIndexedDBAvailable, generateSHA256HashBrowser, Deferred } from '@firebase/util';
 
-import { type ConnectorConfig } from '../api/DataConnect';
+import { CacheProviderImpl, PublicIndexedDbProvider, type ConnectorConfig } from '../api/DataConnect';
 import { DataConnectError } from '../core/error';
 import { type AuthTokenProvider } from '../core/FirebaseAuthProvider';
 import { logDebug } from '../logger';
@@ -21,7 +21,7 @@ export type DataConnectStorage = typeof Memory | typeof Persistent;
  * CacheSettings
  */
 export interface CacheSettings {
-  storage: DataConnectStorage;
+  storage: CacheProviderImpl;
   maxSizeBytes: number;
 }
 
@@ -57,7 +57,7 @@ export class DataConnectCache {
   }
 
   async getIdentifier(uid: string): Promise<string> {
-    const identifier = `${this.cacheSettings?.storage === Persistent ? 'persistent' : 'memory'}-${this.projectId}-${this.connectorConfig.service}-${this.connectorConfig.connector}-${this.connectorConfig.location}-${uid}-${this.host}`;
+    const identifier = `${this.cacheSettings?.storage instanceof InMemoryCacheProvider  ? 'persistent' : 'memory'}-${this.projectId}-${this.connectorConfig.service}-${this.connectorConfig.connector}-${this.connectorConfig.location}-${uid}-${this.host}`;
     const sha256 = await generateSHA256HashBrowser(identifier);
     return sha256;
   }
@@ -77,7 +77,7 @@ export class DataConnectCache {
     await this.cacheProvider?.close();
     let cacheProvider: CacheProvider;
     const identifier = await this.getIdentifier(this.uid);
-    const isPersistenceEnabled = this.cacheSettings?.storage === Persistent;
+    const isPersistenceEnabled = this.cacheSettings?.storage instanceof PublicIndexedDbProvider;
     if (this.cacheSettings) {
       cacheProvider = isPersistenceEnabled ? new IndexedDBCacheProvider(identifier) : new InMemoryCacheProvider(identifier);
     } else if (!isIndexedDBAvailable()) {

packages/data-connect/src/cache/IndexedDBCacheProvider.ts

@@ -8,7 +8,6 @@ export class IndexedDBCacheProvider implements CacheProvider {
   private bdos = new Map<string, EntityDataObject>();
   private resultTrees = new Map<string, ResultTree>();
   private idbManager: IndexedDbManager;
-  private readFromDb = false;
   private initialized = false;
   isIdbAvailable(): boolean {
     return typeof window !== 'undefined' && 'indexedDB' in window;