chore: add changes

Author: DominicGBauer

packages/common/src/client/AbstractPowerSyncDatabase.ts

@@ -27,7 +27,8 @@ import {
   type AdditionalConnectionOptions,
   type PowerSyncConnectionOptions,
   StreamingSyncImplementation,
-  StreamingSyncImplementationListener
+  StreamingSyncImplementationListener,
+  DEFAULT_RETRY_DELAY_MS
 } from './sync/stream/AbstractStreamingSyncImplementation.js';
 import { runOnSchemaChange } from './runOnSchemaChange.js';
 
@@ -237,7 +238,7 @@ export abstract class AbstractPowerSyncDatabase extends BaseObserver<PowerSyncDB
 
   protected abstract generateSyncStreamImplementation(
     connector: PowerSyncBackendConnector,
-    options?: AdditionalConnectionOptions
+    options: Required<AdditionalConnectionOptions>
   ): StreamingSyncImplementation;
 
   protected abstract generateBucketStorageAdapter(): BucketStorageAdapter;
@@ -382,9 +383,13 @@ export abstract class AbstractPowerSyncDatabase extends BaseObserver<PowerSyncDB
       throw new Error('Cannot connect using a closed client');
     }
 
+    // Use the options passed in during connect, or fallback to the options set during database creation or fallback to the default options
+    const retryDelayMs = options?.retryDelayMs ?? this.options.retryDelayMs ?? this.options.retryDelay ?? DEFAULT_RETRY_DELAY_MS;
+    const crudUploadThrottleMs = options?.crudUploadThrottleMs ?? this.options.crudUploadThrottleMs ?? DEFAULT_CRUD_UPLOAD_THROTTLE_MS;
+
     this.syncStreamImplementation = this.generateSyncStreamImplementation(connector, {
-      crudUploadThrottleMs: options?.crudUploadThrottleMs,
-      retryDelayMs: options?.retryDelayMs
+      retryDelayMs,
+      crudUploadThrottleMs,
     });
     this.syncStatusListenerDisposer = this.syncStreamImplementation.registerListener({
       statusChanged: (status) => {

packages/react-native/src/db/PowerSyncDatabase.ts

@@ -45,12 +45,9 @@ export class PowerSyncDatabase extends AbstractPowerSyncDatabase {
   protected generateSyncStreamImplementation(
     connector: PowerSyncBackendConnector,
     // This is used to pass in options on connection instead of only during database creation
-    options?: AdditionalConnectionOptions
+    options: Required<AdditionalConnectionOptions>
   ): AbstractStreamingSyncImplementation {
     const remote = new ReactNativeRemote(connector);
-    // Use the options passed in during connect, or fallback to the options set during database creation
-    const retryDelayMs = options?.retryDelayMs ?? this.options.retryDelayMs ?? this.options.retryDelay;
-    const crudUploadThrottleMs = options?.crudUploadThrottleMs ?? this.options.crudUploadThrottleMs;
 
     return new ReactNativeStreamingSyncImplementation({
       adapter: this.bucketStorageAdapter,
@@ -59,8 +56,8 @@ export class PowerSyncDatabase extends AbstractPowerSyncDatabase {
         await this.waitForReady();
         await connector.uploadData(this);
       },
-      retryDelayMs,
-      crudUploadThrottleMs,
+      retryDelayMs: options.retryDelayMs,
+      crudUploadThrottleMs: options.crudUploadThrottleMs,
       identifier: this.database.name
     });
   }

packages/web/src/db/PowerSyncDatabase.ts

@@ -168,17 +168,13 @@ export class PowerSyncDatabase extends AbstractPowerSyncDatabase {
   protected generateSyncStreamImplementation(
     connector: PowerSyncBackendConnector,
     // This is used to pass in options on connection instead of only during db creation
-    options?: AdditionalConnectionOptions
+    options: Required<AdditionalConnectionOptions>
   ): StreamingSyncImplementation {
     const remote = new WebRemote(connector);
-    // Use the options passed in during connect, or fallback to the options set during database creation
-    const retryDelayMs = options?.retryDelayMs ?? this.options.retryDelayMs ?? this.options.retryDelay;
-    const crudUploadThrottleMs = options?.crudUploadThrottleMs ?? this.options.crudUploadThrottleMs;
-
     const syncOptions: WebStreamingSyncImplementationOptions = {
       ...(this.options as {}),
-      retryDelayMs,
-      crudUploadThrottleMs,
+      retryDelayMs: options.retryDelayMs,
+      crudUploadThrottleMs: options.crudUploadThrottleMs,
       flags: this.resolvedFlags,
       adapter: this.bucketStorageAdapter,
       remote,

packages/web/tests/src/db/PowersyncDatabase.test.ts

@@ -3,7 +3,6 @@ import { PowerSyncDatabase, SharedWebStreamingSyncImplementation, WebStreamingSy
 import { SSRStreamingSyncImplementation } from '../../../src/db/sync/SSRWebStreamingSyncImplementation'
 import { testSchema } from '../../utils/testDb'
 
-
 vi.mock('../../../src/db/sync/WebStreamingSyncImplementation')
 vi.mock('../../../src/db/sync/SharedWebStreamingSyncImplementation')
 vi.mock('../../../src/db/sync/SSRWebStreamingSyncImplementation')
@@ -38,7 +37,7 @@ describe('PowerSyncDatabase - generateSyncStreamImplementation', () => {
       crudUploadThrottleMs: 2000
     })
 
-    db['generateSyncStreamImplementation'](mockConnector)
+    db['generateSyncStreamImplementation'](mockConnector, { retryDelayMs: 1000, crudUploadThrottleMs: 2000 })
     expect(SSRStreamingSyncImplementation).toHaveBeenCalled()
 
     await setTimeout(() => window.removeEventListener('unhandledrejection', handler), 1)
@@ -50,7 +49,7 @@ describe('PowerSyncDatabase - generateSyncStreamImplementation', () => {
       database: { dbFilename: 'test.db' },
       flags: { enableMultiTabs: true }
     })
-    db['generateSyncStreamImplementation'](mockConnector)
+    db['generateSyncStreamImplementation'](mockConnector, { retryDelayMs: 1000, crudUploadThrottleMs: 2000 })
     expect(SharedWebStreamingSyncImplementation).toHaveBeenCalled()
   })
 
@@ -64,6 +63,7 @@ describe('PowerSyncDatabase - generateSyncStreamImplementation', () => {
         ssrMode: false,
         enableMultiTabs: false,
       },
+      retryDelayMs: 1000,
       crudUploadThrottleMs: 1000
     })
 
@@ -76,30 +76,8 @@ describe('PowerSyncDatabase - generateSyncStreamImplementation', () => {
     )
   })
 
-  it('handles partial option overrides', () => {
-    const db = new PowerSyncDatabase({
-      schema: testSchema,
-      database: {
-        dbFilename: 'test.db'
-      },
-      flags: {
-        ssrMode: false,
-        enableMultiTabs: false,
-      },
-      retryDelayMs: 1000,
-      crudUploadThrottleMs: 2000
-    })
-
-    db['generateSyncStreamImplementation'](mockConnector, { retryDelayMs: 50000 })
-    expect(WebStreamingSyncImplementation).toHaveBeenCalledWith(
-      expect.objectContaining({
-        retryDelayMs: 50000,
-      })
-    )
-  })
-
   // This test can be removed once retryDelay is removed and entirely replaced with retryDelayMs
-  it('works when using deprecated retryDelay instead of retryDelayMs', () => {
+  it('works when using deprecated retryDelay instead of retryDelayMs', async () => {
     const db = new PowerSyncDatabase({
       schema: testSchema,
       database: {
@@ -112,10 +90,10 @@ describe('PowerSyncDatabase - generateSyncStreamImplementation', () => {
       retryDelay: 11100,
     })
 
-    db['generateSyncStreamImplementation'](mockConnector)
+    db['generateSyncStreamImplementation'](mockConnector, { crudUploadThrottleMs: 2000, retryDelayMs: 50000 })
     expect(WebStreamingSyncImplementation).toHaveBeenCalledWith(
       expect.objectContaining({
-        retryDelayMs: 11100,
+        retryDelay: 11100,
       })
     )
   })