@powersync/service-module-mssql 0.0.0-dev-20251128080741 → 0.0.0-dev-20251128124236

package/src/replication/CDCPoller.ts

@@ -5,7 +5,7 @@ import { MSSQLSourceTable } from '../common/MSSQLSourceTable.js';
 import { LSN } from '../common/LSN.js';
 import sql from 'mssql';
 import { getMinLSN, incrementLSN } from '../utils/mssql.js';
-import { CDCPollingOptions } from '../types/types.js';
+import { AdditionalConfig } from '../types/types.js';
 
 enum Operation {
   DELETE = 1,
@@ -52,8 +52,8 @@ export interface CDCPollerOptions {
   eventHandler: CDCEventHandler;
   sourceTables: MSSQLSourceTable[];
   startLSN: LSN;
-  pollingOptions: CDCPollingOptions;
   logger?: Logger;
+  additionalConfig: AdditionalConfig;
 }
 
 /**
@@ -79,11 +79,11 @@ export class CDCPoller {
   }
 
   private get pollingBatchSize(): number {
-    return this.options.pollingOptions.batchSize;
+    return this.options.additionalConfig.pollingBatchSize;
   }
 
   private get pollingIntervalMs(): number {
-    return this.options.pollingOptions.intervalMs;
+    return this.options.additionalConfig.pollingIntervalMs;
   }
 
   private get sourceTables(): MSSQLSourceTable[] {

package/src/replication/CDCReplicationJob.ts

@@ -2,11 +2,11 @@ import { replication } from '@powersync/service-core';
 import { MSSQLConnectionManagerFactory } from './MSSQLConnectionManagerFactory.js';
 import { container, logger as defaultLogger } from '@powersync/lib-services-framework';
 import { CDCDataExpiredError, CDCStream } from './CDCStream.js';
-import { CDCPollingOptions } from '../types/types.js';
+import { AdditionalConfig } from '../types/types.js';
 
 export interface CDCReplicationJobOptions extends replication.AbstractReplicationJobOptions {
   connectionFactory: MSSQLConnectionManagerFactory;
-  pollingOptions: CDCPollingOptions;
+  additionalConfig: AdditionalConfig;
 }
 
 export class CDCReplicationJob extends replication.AbstractReplicationJob {
@@ -72,7 +72,7 @@ export class CDCReplicationJob extends replication.AbstractReplicationJob {
         storage: this.options.storage,
         metrics: this.options.metrics,
         connections: connectionManager,
-        pollingOptions: this.cdcReplicationJobOptions.pollingOptions
+        additionalConfig: this.cdcReplicationJobOptions.additionalConfig
       });
       this.lastStream = stream;
       await stream.replicate();

package/src/replication/CDCReplicator.ts

@@ -2,11 +2,11 @@ import { replication, storage } from '@powersync/service-core';
 import { MSSQLConnectionManagerFactory } from './MSSQLConnectionManagerFactory.js';
 import { CDCReplicationJob } from './CDCReplicationJob.js';
 import { MSSQLModule } from '../module/MSSQLModule.js';
-import { CDCPollingOptions } from '../types/types.js';
+import { AdditionalConfig } from '../types/types.js';
 
 export interface CDCReplicatorOptions extends replication.AbstractReplicatorOptions {
   connectionFactory: MSSQLConnectionManagerFactory;
-  pollingOptions: CDCPollingOptions;
+  additionalConfig: AdditionalConfig;
 }
 
 export class CDCReplicator extends replication.AbstractReplicator<CDCReplicationJob> {
@@ -27,7 +27,7 @@ export class CDCReplicator extends replication.AbstractReplicator<CDCReplication
       lock: options.lock,
       connectionFactory: this.connectionFactory,
       rateLimiter: this.rateLimiter,
-      pollingOptions: this.cdcReplicatorOptions.pollingOptions
+      additionalConfig: this.cdcReplicatorOptions.additionalConfig
     });
   }
 

package/src/replication/CDCStream.ts

@@ -39,7 +39,7 @@ import { LSN } from '../common/LSN.js';
 import { MSSQLSourceTable } from '../common/MSSQLSourceTable.js';
 import { MSSQLSourceTableCache } from '../common/MSSQLSourceTableCache.js';
 import { CDCEventHandler, CDCPoller } from './CDCPoller.js';
-import { CDCPollingOptions } from '../types/types.js';
+import { AdditionalConfig } from '../types/types.js';
 
 export interface CDCStreamOptions {
   connections: MSSQLConnectionManager;
@@ -54,7 +54,7 @@ export interface CDCStreamOptions {
    */
   snapshotBatchSize?: number;
 
-  pollingOptions: CDCPollingOptions;
+  additionalConfig: AdditionalConfig;
 }
 
 export enum SnapshotStatus {
@@ -589,8 +589,8 @@ export class CDCStream {
           eventHandler,
           sourceTables,
           startLSN,
-          pollingOptions: this.options.pollingOptions,
-          logger: this.logger
+          logger: this.logger,
+          additionalConfig: this.options.additionalConfig
         });
 
         this.abortSignal.addEventListener(

package/src/replication/MSSQLConnectionManager.ts

@@ -31,7 +31,7 @@ export class MSSQLConnectionManager extends BaseObserver<MSSQLConnectionManagerL
       options: {
         appName: `powersync/${POWERSYNC_VERSION}`,
         encrypt: true, // Required for Azure
-        trustServerCertificate: options.trustServerCertificate
+        trustServerCertificate: options.additionalConfig.trustServerCertificate
       }
     });
   }

package/src/types/types.ts

@@ -63,21 +63,42 @@ export const DefaultAuthentication = t.object({
 });
 export type DefaultAuthentication = t.Decoded<typeof DefaultAuthentication>;
 
-export type AuthenticationType =
-  | DefaultAuthentication
-  | AzureActiveDirectoryPasswordAuthentication
-  | AzureActiveDirectoryServicePrincipalSecret;
+export const Authentication = DefaultAuthentication.or(AzureActiveDirectoryPasswordAuthentication).or(
+  AzureActiveDirectoryServicePrincipalSecret
+);
+export type Authentication = t.Decoded<typeof Authentication>;
 
-  
-export interface CDCPollingOptions {
+export const AdditionalConfig = t.object({
+  /**
+   * Interval in milliseconds to wait between polling cycles. Defaults to 1000 milliseconds.
+   */
+  pollingIntervalMs: t.number.optional(),
   /**
    * Maximum number of transactions to poll per polling cycle. Defaults to 10.
    */
-  batchSize: number;
+  pollingBatchSize: t.number.optional(),
+
   /**
-   * Interval in milliseconds to wait between polling cycles. Defaults to 1 second.
+   *  Whether to trust the server certificate. Set to true for local development and self-signed certificates.
+   *  Default is false.
    */
-  intervalMs: number;
+  trustServerCertificate: t.boolean.optional()
+});
+
+export interface AdditionalConfig {
+  /**
+   * Interval in milliseconds to wait between polling cycles. Defaults to 1000 milliseconds.
+   */
+  pollingIntervalMs: number;
+  /**
+   * Maximum number of transactions to poll per polling cycle. Defaults to 10.
+   */
+  pollingBatchSize: number;
+  /**
+   *  Whether to trust the server certificate. Set to true for local development and self-signed certificates.
+   *  Default is false.
+   */
+  trustServerCertificate: boolean;
 }
 
 export interface NormalizedMSSQLConnectionConfig {
@@ -91,16 +112,11 @@ export interface NormalizedMSSQLConnectionConfig {
   database: string;
   schema?: string;
 
-  authentication?: AuthenticationType;
-
-  cdcPollingOptions: CDCPollingOptions;
+  authentication?: Authentication;
 
-  /**  
-   *  Whether to trust the server certificate. Set to true for local development and self-signed certificates.
-   *  Default is false.
-  */
-  trustServerCertificate: boolean;
   lookup?: LookupFunction;
+
+  additionalConfig: AdditionalConfig;
 }
 
 export const MSSQLConnectionConfig = service_types.configFile.DataSourceConfig.and(
@@ -114,22 +130,10 @@ export const MSSQLConnectionConfig = service_types.configFile.DataSourceConfig.a
     hostname: t.string.optional(),
     port: service_types.configFile.portCodec.optional(),
 
-    authentication: DefaultAuthentication.or(AzureActiveDirectoryPasswordAuthentication)
-      .or(AzureActiveDirectoryServicePrincipalSecret)
-      .optional(),
-
-    cdcPollingOptions: t.object({
-      batchSize: t.number.optional(),
-      intervalMs: t.number.optional()
-    }).optional(),
-
-    /**  
-     *  Whether to trust the server certificate. Set to true for local development and self-signed certificates.
-     *  Default is false.
-     */
-    trustServerCertificate: t.boolean.optional(),
+    authentication: Authentication.optional(),
 
-    reject_ip_ranges: t.array(t.string).optional()
+    reject_ip_ranges: t.array(t.string).optional(),
+    additionalConfig: AdditionalConfig.optional()
   })
 );
 
@@ -203,19 +207,11 @@ export function normalizeConnectionConfig(options: MSSQLConnectionConfig): Norma
     lookup,
     authentication: options.authentication,
 
-    cdcPollingOptions: {
-      /**
-       * Maximum number of transactions to poll per polling cycle. Defaults to 10.
-       */
-      batchSize: options.cdcPollingOptions?.batchSize ?? 10,
-
-      /**
-       * Interval in milliseconds to wait between polling cycles. Defaults to 1 second.
-       */ 
-      intervalMs: options.cdcPollingOptions?.intervalMs ?? 1000,
-    },
-
-    trustServerCertificate: options.trustServerCertificate ?? false,
+    additionalConfig: {
+      pollingIntervalMs: options.additionalConfig?.pollingIntervalMs ?? 1000,
+      pollingBatchSize: options.additionalConfig?.pollingBatchSize ?? 10,
+      trustServerCertificate: options.additionalConfig?.trustServerCertificate ?? false
+    }
   } satisfies NormalizedMSSQLConnectionConfig;
 }
 

package/test/src/CDCStream.test.ts

@@ -1,13 +1,7 @@
 import { describe, expect, test } from 'vitest';
 import { METRICS_HELPER, putOp, removeOp } from '@powersync/service-core-tests';
 import { ReplicationMetric } from '@powersync/service-types';
-import {
-  createTestTable,
-  describeWithStorage,
-  INITIALIZED_MONGO_STORAGE_FACTORY,
-  insertTestData,
-  waitForPendingCDCChanges
-} from './util.js';
+import { createTestTable, describeWithStorage, insertTestData, waitForPendingCDCChanges } from './util.js';
 import { storage } from '@powersync/service-core';
 import { CDCStreamTestContext } from './CDCStreamTestContext.js';
 import { getLatestReplicatedLSN } from '@module/utils/mssql.js';

package/test/src/CDCStreamTestContext.ts

@@ -12,7 +12,6 @@ import { clearTestDb, getClientCheckpoint, TEST_CONNECTION_OPTIONS } from './uti
 import { CDCStream, CDCStreamOptions } from '@module/replication/CDCStream.js';
 import { MSSQLConnectionManager } from '@module/replication/MSSQLConnectionManager.js';
 import timers from 'timers/promises';
-import { CDCPollingOptions } from '@module/types/types.js';
 
 /**
  * Tests operating on the change data capture need to configure the stream and manage asynchronous
@@ -110,10 +109,11 @@ export class CDCStreamTestContext implements AsyncDisposable {
       metrics: METRICS_HELPER.metricsEngine,
       connections: this.connectionManager,
       abortSignal: this.abortController.signal,
-      pollingOptions: {
-        batchSize: 10,
-        intervalMs: 1000
-      } satisfies CDCPollingOptions,
+      additionalConfig: {
+        pollingBatchSize: 10,
+        pollingIntervalMs: 1000,
+        trustServerCertificate: true
+      },
       ...this.cdcStreamOptions
     };
     this._cdcStream = new CDCStream(options);

package/test/src/CDCStream_resumable_snapshot.test.ts

@@ -46,10 +46,9 @@ async function testResumingReplication(factory: TestStorageFactory, stopAfter: n
   await createTestTableWithBasicId(connectionManager, 'test_data1');
   await createTestTableWithBasicId(connectionManager, 'test_data2');
 
-  let beforeLSN = await getLatestReplicatedLSN(connectionManager);
   await connectionManager.query(`INSERT INTO test_data1(description) SELECT 'value' FROM GENERATE_SERIES(1, 1000, 1)`);
+  let beforeLSN = await getLatestReplicatedLSN(connectionManager);
   await connectionManager.query(`INSERT INTO test_data2(description) SELECT 'value' FROM GENERATE_SERIES(1, 10000, 1)`);
-
   await waitForPendingCDCChanges(beforeLSN, connectionManager);
 
   const p = context.replicateSnapshot();

package/test/src/util.ts

@@ -37,7 +37,11 @@ export function describeWithStorage(options: TestOptions, fn: (factory: TestStor
 export const TEST_CONNECTION_OPTIONS = types.normalizeConnectionConfig({
   type: 'mssql',
   uri: TEST_URI,
-  trustServerCertificate: true
+  additionalConfig: {
+    pollingBatchSize: 10,
+    pollingIntervalMs: 1000,
+    trustServerCertificate: true
+  }
 });
 
 /**