work

Author: dconeybe

packages/firestore/src/api/database.ts

@@ -310,7 +310,6 @@ export function configureFirestore(firestore: Firestore): void {
     firestore._appCheckCredentials,
     firestore._queue,
     databaseInfo,
-    settings.experimentalOptions.sendWriteRequestsDelayMs ?? null,
     firestore._componentsProvider &&
       buildComponentProvider(firestore._componentsProvider)
   );

packages/firestore/src/core/component_provider.ts

@@ -85,7 +85,6 @@ export interface ComponentConfiguration {
   clientId: ClientId;
   initialUser: User;
   maxConcurrentLimboResolutions: number;
-  sendWriteRequestsDelayMs: number | null;
 }
 
 export interface OfflineComponentProviderFactory {
@@ -487,7 +486,7 @@ export class OnlineComponentProvider {
           OnlineStateSource.RemoteStore
         ),
       newConnectivityMonitor(),
-      cfg.sendWriteRequestsDelayMs
+      cfg.databaseInfo.sendWriteRequestsDelayMs
     );
   }
 

packages/firestore/src/core/database_info.ts

@@ -38,6 +38,8 @@ export class DatabaseInfo {
    * @param longPollingOptions Options that configure long-polling.
    * @param useFetchStreams Whether to use the Fetch API instead of
    * XMLHTTPRequest
+   * @param sendWriteRequestsDelayMs The delay, in milliseconds, to use before
+   * sending write requests over the wire in remote store.
    */
   constructor(
     readonly databaseId: DatabaseId,
@@ -48,7 +50,8 @@ export class DatabaseInfo {
     readonly forceLongPolling: boolean,
     readonly autoDetectLongPolling: boolean,
     readonly longPollingOptions: ExperimentalLongPollingOptions,
-    readonly useFetchStreams: boolean
+    readonly useFetchStreams: boolean,
+    readonly sendWriteRequestsDelayMs: number | null
   ) {}
 }
 

packages/firestore/src/core/firestore_client.ts

@@ -140,7 +140,6 @@ export class FirestoreClient {
      */
     public asyncQueue: AsyncQueue,
     private databaseInfo: DatabaseInfo,
-    private sendWriteRequestsDelayMs: number | null,
     componentProvider?: {
       _offline: OfflineComponentProvider;
       _online: OnlineComponentProvider;
@@ -166,8 +165,7 @@ export class FirestoreClient {
       authCredentials: this.authCredentials,
       appCheckCredentials: this.appCheckCredentials,
       initialUser: this.user,
-      maxConcurrentLimboResolutions: MAX_CONCURRENT_LIMBO_RESOLUTIONS,
-      sendWriteRequestsDelayMs: this.sendWriteRequestsDelayMs
+      maxConcurrentLimboResolutions: MAX_CONCURRENT_LIMBO_RESOLUTIONS
     };
   }
 

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

@@ -119,6 +119,7 @@ export function makeDatabaseInfo(
     settings.experimentalForceLongPolling,
     settings.experimentalAutoDetectLongPolling,
     cloneLongPollingOptions(settings.experimentalLongPollingOptions),
-    settings.useFetchStreams
+    settings.useFetchStreams,
+    settings.experimental.sendWriteRequestsDelayMs ?? null
   );
 }

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

@@ -90,7 +90,7 @@ export interface PrivateSettings extends FirestoreSettings {
   experimentalLongPollingOptions?: ExperimentalLongPollingOptions;
   useFetchStreams?: boolean;
   emulatorOptions?: { mockUserToken?: EmulatorMockTokenOptions | string };
-  experimentalOptions?: ExperimentalOptions;
+  experimental?: ExperimentalOptions;
 
   localCache?: FirestoreLocalCache;
 }
@@ -119,7 +119,7 @@ export class FirestoreSettingsImpl {
 
   readonly useFetchStreams: boolean;
   readonly localCache?: FirestoreLocalCache;
-  readonly experimentalOptions: ExperimentalOptions;
+  readonly experimental: ExperimentalOptions;
 
   // Can be a google-auth-library or gapi client.
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
@@ -188,10 +188,8 @@ export class FirestoreSettingsImpl {
 
     this.useFetchStreams = !!settings.useFetchStreams;
 
-    this.experimentalOptions = cloneExperimentalOptions(
-      settings.experimentalOptions ?? {}
-    );
-    validateExperimentalOptions(this.experimentalOptions);
+    this.experimental = cloneExperimentalOptions(settings.experimental ?? {});
+    validateExperimentalOptions(this.experimental);
   }
 
   isEqual(other: FirestoreSettingsImpl): boolean {
@@ -210,10 +208,7 @@ export class FirestoreSettingsImpl {
       ) &&
       this.ignoreUndefinedProperties === other.ignoreUndefinedProperties &&
       this.useFetchStreams === other.useFetchStreams &&
-      experimentalOptionsEqual(
-        this.experimentalOptions,
-        other.experimentalOptions
-      )
+      experimentalOptionsEqual(this.experimental, other.experimental)
     );
   }
 }

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

@@ -61,7 +61,8 @@ export function getDefaultDatabaseInfo(): DatabaseInfo {
     cloneLongPollingOptions(
       DEFAULT_SETTINGS.experimentalLongPollingOptions ?? {}
     ),
-    /*use FetchStreams= */ false
+    /*use FetchStreams= */ false,
+    /*sendWriteRequestsDelayMs= */ null
   );
 }
 

packages/firestore/test/unit/remote/rest_connection.test.ts

@@ -67,7 +67,8 @@ describe('RestConnection', () => {
     /*forceLongPolling=*/ false,
     /*autoDetectLongPolling=*/ false,
     /*longPollingOptions=*/ {},
-    /*useFetchStreams=*/ false
+    /*useFetchStreams=*/ false,
+    /*sendWriteRequestsDelayMs= */ null
   );
   const connection = new TestRestConnection(testDatabaseInfo);
 

packages/firestore/test/unit/specs/spec_test_runner.ts

@@ -283,7 +283,8 @@ abstract class TestRunner {
       /*forceLongPolling=*/ false,
       /*autoDetectLongPolling=*/ false,
       /*longPollingOptions=*/ {},
-      /*useFetchStreams=*/ false
+      /*useFetchStreams=*/ false,
+      config.sendWriteRequestsDelayMs ?? null
     );
 
     // TODO(mrschmidt): During client startup in `firestore_client`, we block
@@ -300,7 +301,6 @@ abstract class TestRunner {
     this.useEagerGCForMemory = config.useEagerGCForMemory;
     this.numClients = config.numClients;
     this.maxConcurrentLimboResolutions = config.maxConcurrentLimboResolutions;
-    this.sendWriteRequestsDelayMs = config.sendWriteRequestsDelayMs;
     this.expectedActiveLimboDocs = [];
     this.expectedEnqueuedLimboDocs = [];
     this.expectedActiveTargets = new Map<TargetId, ActiveTargetSpec>();
@@ -318,8 +318,7 @@ abstract class TestRunner {
       clientId: this.clientId,
       initialUser: this.user,
       maxConcurrentLimboResolutions:
-        this.maxConcurrentLimboResolutions ?? Number.MAX_SAFE_INTEGER,
-      sendWriteRequestsDelayMs: this.sendWriteRequestsDelayMs ?? null
+        this.maxConcurrentLimboResolutions ?? Number.MAX_SAFE_INTEGER
     } satisfies ComponentConfiguration;
 
     this.connection = new MockConnection(this.queue);