@powersync/service-module-mongodb 0.13.2 → 0.14.0

package/CHANGELOG.md

@@ -1,5 +1,34 @@
 # @powersync/service-module-mongodb
 
+## 0.14.0
+
+### Minor Changes
+
+- 8a4c34e: Refactor `BucketStorageFactory` and `PersistedSyncRulesContent` to be abstract classes instead of interfaces.
+- 8bd83e8: Introduce storage versions.
+
+### Patch Changes
+
+- 15aea77: Support connection parameters via database URL query string. PostgreSQL supports `connect_timeout`. MongoDB supports `connectTimeoutMS`, `socketTimeoutMS`, `serverSelectionTimeoutMS`, `maxPoolSize`, `maxIdleTimeMS`. MySQL supports `connectTimeout`, `connectionLimit`, `queueLimit`.
+- Updated dependencies [15aea77]
+- Updated dependencies [0998251]
+- Updated dependencies [65f3c89]
+- Updated dependencies [1c45667]
+- Updated dependencies [8785a3f]
+- Updated dependencies [8a4c34e]
+- Updated dependencies [b440093]
+- Updated dependencies [d7ff4ad]
+- Updated dependencies [c683322]
+- Updated dependencies [8bd83e8]
+- Updated dependencies [83989b2]
+- Updated dependencies [79a9729]
+- Updated dependencies [5edd95f]
+  - @powersync/lib-service-mongodb@0.6.20
+  - @powersync/service-core@1.20.0
+  - @powersync/service-types@0.15.0
+  - @powersync/service-sync-rules@0.32.0
+  - @powersync/lib-services-framework@0.8.3
+
 ## 0.13.2
 
 ### Patch Changes

package/dist/replication/MongoManager.js

@@ -11,6 +11,7 @@ export class MongoManager extends BaseObserver {
     constructor(options, overrides) {
         super();
         this.options = options;
+        const params = options.connectionParams;
         // The pool is lazy - no connections are opened until a query is performed.
         this.client = new mongo.MongoClient(options.uri, {
             auth: {
@@ -18,12 +19,12 @@ export class MongoManager extends BaseObserver {
                 password: options.password
             },
             lookup: options.lookup,
-            // Time for connection to timeout
-            connectTimeoutMS: 5_000,
-            // Time for individual requests to timeout
-            socketTimeoutMS: 60_000,
-            // How long to wait for new primary selection
-            serverSelectionTimeoutMS: 30_000,
+            // Time for connection to timeout (URL param overrides default)
+            connectTimeoutMS: params.connectTimeoutMS ?? 5_000,
+            // Time for individual requests to timeout (URL param overrides default)
+            socketTimeoutMS: params.socketTimeoutMS ?? 60_000,
+            // How long to wait for new primary selection (URL param overrides default)
+            serverSelectionTimeoutMS: params.serverSelectionTimeoutMS ?? 30_000,
             // Identify the client
             appName: `powersync ${POWERSYNC_VERSION}`,
             // Deprecated in the driver - in a future release we may have to rely on appName only.
@@ -35,9 +36,9 @@ export class MongoManager extends BaseObserver {
             // Avoid too many connections:
             // 1. It can overwhelm the source database.
             // 2. Processing too many queries in parallel can cause the process to run out of memory.
-            maxPoolSize: 8,
+            maxPoolSize: params.maxPoolSize ?? 8,
             maxConnecting: 3,
-            maxIdleTimeMS: 60_000,
+            maxIdleTimeMS: params.maxIdleTimeMS ?? 60_000,
             ...BSON_DESERIALIZE_DATA_OPTIONS,
             ...overrides
         });

package/dist/replication/MongoManager.js.map

@@ -1 +1 @@
-{"version":3,"file":"MongoManager.js","sourceRoot":"","sources":["../../src/replication/MongoManager.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,gCAAgC,CAAC;AAGvD,OAAO,EAAE,6BAA6B,EAAE,iBAAiB,EAAE,MAAM,yBAAyB,CAAC;AAC3F,OAAO,EAAE,YAAY,EAAE,MAAM,mCAAmC,CAAC;AAMjE;;GAEG;AACH,MAAM,OAAO,YAAa,SAAQ,YAAkC;IAKzD;IAJO,MAAM,CAAoB;IAC1B,EAAE,CAAW;IAE7B,YACS,OAAwC,EAC/C,SAAoC;QAEpC,KAAK,EAAE,CAAC;QAHD,YAAO,GAAP,OAAO,CAAiC;QAI/C,2EAA2E;QAC3E,IAAI,CAAC,MAAM,GAAG,IAAI,KAAK,CAAC,WAAW,CAAC,OAAO,CAAC,GAAG,EAAE;YAC/C,IAAI,EAAE;gBACJ,QAAQ,EAAE,OAAO,CAAC,QAAQ;gBAC1B,QAAQ,EAAE,OAAO,CAAC,QAAQ;aAC3B;YAED,MAAM,EAAE,OAAO,CAAC,MAAM;YACtB,iCAAiC;YACjC,gBAAgB,EAAE,KAAK;YACvB,0CAA0C;YAC1C,eAAe,EAAE,MAAM;YACvB,6CAA6C;YAC7C,wBAAwB,EAAE,MAAM;YAEhC,sBAAsB;YACtB,OAAO,EAAE,aAAa,iBAAiB,EAAE;YACzC,sFAAsF;YACtF,UAAU,EAAE;gBACV,4CAA4C;gBAC5C,IAAI,EAAE,WAAW;gBACjB,OAAO,EAAE,iBAAiB;aAC3B;YAED,8BAA8B;YAC9B,2CAA2C;YAC3C,yFAAyF;YACzF,WAAW,EAAE,CAAC;YAEd,aAAa,EAAE,CAAC;YAChB,aAAa,EAAE,MAAM;YAErB,GAAG,6BAA6B;YAEhC,GAAG,SAAS;SACb,CAAC,CAAC;QACH,IAAI,CAAC,EAAE,GAAG,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC,OAAO,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAC;IACjD,CAAC;IAED,IAAW,aAAa;QACtB,OAAO,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC;IAC1B,CAAC;IAED,KAAK,CAAC,GAAG;QACP,MAAM,IAAI,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC;QAC1B,IAAI,CAAC,gBAAgB,CAAC,CAAC,QAAQ,EAAE,EAAE;YACjC,QAAQ,CAAC,OAAO,EAAE,EAAE,CAAC;QACvB,CAAC,CAAC,CAAC;IACL,CAAC;CACF"}
+{"version":3,"file":"MongoManager.js","sourceRoot":"","sources":["../../src/replication/MongoManager.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,gCAAgC,CAAC;AAGvD,OAAO,EAAE,6BAA6B,EAAE,iBAAiB,EAAE,MAAM,yBAAyB,CAAC;AAC3F,OAAO,EAAE,YAAY,EAAE,MAAM,mCAAmC,CAAC;AAMjE;;GAEG;AACH,MAAM,OAAO,YAAa,SAAQ,YAAkC;IAKzD;IAJO,MAAM,CAAoB;IAC1B,EAAE,CAAW;IAE7B,YACS,OAAwC,EAC/C,SAAoC;QAEpC,KAAK,EAAE,CAAC;QAHD,YAAO,GAAP,OAAO,CAAiC;QAI/C,MAAM,MAAM,GAAG,OAAO,CAAC,gBAAgB,CAAC;QAExC,2EAA2E;QAC3E,IAAI,CAAC,MAAM,GAAG,IAAI,KAAK,CAAC,WAAW,CAAC,OAAO,CAAC,GAAG,EAAE;YAC/C,IAAI,EAAE;gBACJ,QAAQ,EAAE,OAAO,CAAC,QAAQ;gBAC1B,QAAQ,EAAE,OAAO,CAAC,QAAQ;aAC3B;YAED,MAAM,EAAE,OAAO,CAAC,MAAM;YACtB,+DAA+D;YAC/D,gBAAgB,EAAE,MAAM,CAAC,gBAAgB,IAAI,KAAK;YAClD,wEAAwE;YACxE,eAAe,EAAE,MAAM,CAAC,eAAe,IAAI,MAAM;YACjD,2EAA2E;YAC3E,wBAAwB,EAAE,MAAM,CAAC,wBAAwB,IAAI,MAAM;YAEnE,sBAAsB;YACtB,OAAO,EAAE,aAAa,iBAAiB,EAAE;YACzC,sFAAsF;YACtF,UAAU,EAAE;gBACV,4CAA4C;gBAC5C,IAAI,EAAE,WAAW;gBACjB,OAAO,EAAE,iBAAiB;aAC3B;YAED,8BAA8B;YAC9B,2CAA2C;YAC3C,yFAAyF;YACzF,WAAW,EAAE,MAAM,CAAC,WAAW,IAAI,CAAC;YAEpC,aAAa,EAAE,CAAC;YAChB,aAAa,EAAE,MAAM,CAAC,aAAa,IAAI,MAAM;YAE7C,GAAG,6BAA6B;YAEhC,GAAG,SAAS;SACb,CAAC,CAAC;QACH,IAAI,CAAC,EAAE,GAAG,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC,OAAO,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAC;IACjD,CAAC;IAED,IAAW,aAAa;QACtB,OAAO,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC;IAC1B,CAAC;IAED,KAAK,CAAC,GAAG;QACP,MAAM,IAAI,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC;QAC1B,IAAI,CAAC,gBAAgB,CAAC,CAAC,QAAQ,EAAE,EAAE;YACjC,QAAQ,CAAC,OAAO,EAAE,EAAE,CAAC;QACvB,CAAC,CAAC,CAAC;IACL,CAAC;CACF"}

package/dist/types/types.d.ts

@@ -1,3 +1,4 @@
+import type { MongoConnectionParams } from '@powersync/lib-service-mongodb/types';
 import { LookupFunction } from 'node:net';
 import * as t from 'ts-codec';
 export declare enum PostImagesOption {
@@ -42,6 +43,7 @@ export interface NormalizedMongoConnectionConfig {
     password?: string;
     lookup?: LookupFunction;
     postImages: PostImagesOption;
+    connectionParams: MongoConnectionParams;
 }
 export declare const MongoConnectionConfig: t.Intersection<t.Codec<{
     type: string;

package/dist/types/types.js.map

@@ -1 +1 @@
-{"version":3,"file":"types.js","sourceRoot":"","sources":["../../src/types/types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,SAAS,MAAM,sCAAsC,CAAC;AAClE,OAAO,KAAK,aAAa,MAAM,0BAA0B,CAAC;AAE1D,OAAO,KAAK,CAAC,MAAM,UAAU,CAAC;AAE9B,MAAM,CAAN,IAAY,gBAkCX;AAlCD,WAAY,gBAAgB;IAC1B;;;;;;;OAOG;IACH,+BAAW,CAAA;IAEX;;;;;;;OAOG;IACH,qDAAiC,CAAA;IAEjC;;;;;;;;;;;OAWG;IACH,2CAAuB,CAAA;AACzB,CAAC,EAlCW,gBAAgB,KAAhB,gBAAgB,QAkC3B;AAiBD,MAAM,CAAC,MAAM,qBAAqB,GAAG,aAAa,CAAC,UAAU,CAAC,gBAAgB,CAAC,GAAG,CAAC,SAAS,CAAC,eAAe,CAAC,CAAC,GAAG,CAC/G,CAAC,CAAC,MAAM,CAAC;IACP,gCAAgC;IAChC,WAAW,EAAE,CAAC,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,gBAAgB,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC,CAAC,QAAQ,EAAE;CACpG,CAAC,CACH,CAAC;AAaF;;;;GAIG;AACH,MAAM,UAAU,yBAAyB,CAAC,OAAqC;IAC7E,MAAM,IAAI,GAAG,SAAS,CAAC,oBAAoB,CAAC,OAAO,CAAC,CAAC;IAErD,OAAO;QACL,GAAG,IAAI;QACP,EAAE,EAAE,OAAO,CAAC,EAAE,IAAI,SAAS;QAC3B,GAAG,EAAE,OAAO,CAAC,GAAG,IAAI,SAAS;QAC7B,UAAU,EAAG,OAAO,CAAC,WAA4C,IAAI,gBAAgB,CAAC,GAAG;KAC1F,CAAC;AACJ,CAAC"}
+{"version":3,"file":"types.js","sourceRoot":"","sources":["../../src/types/types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,SAAS,MAAM,sCAAsC,CAAC;AAElE,OAAO,KAAK,aAAa,MAAM,0BAA0B,CAAC;AAE1D,OAAO,KAAK,CAAC,MAAM,UAAU,CAAC;AAE9B,MAAM,CAAN,IAAY,gBAkCX;AAlCD,WAAY,gBAAgB;IAC1B;;;;;;;OAOG;IACH,+BAAW,CAAA;IAEX;;;;;;;OAOG;IACH,qDAAiC,CAAA;IAEjC;;;;;;;;;;;OAWG;IACH,2CAAuB,CAAA;AACzB,CAAC,EAlCW,gBAAgB,KAAhB,gBAAgB,QAkC3B;AAmBD,MAAM,CAAC,MAAM,qBAAqB,GAAG,aAAa,CAAC,UAAU,CAAC,gBAAgB,CAAC,GAAG,CAAC,SAAS,CAAC,eAAe,CAAC,CAAC,GAAG,CAC/G,CAAC,CAAC,MAAM,CAAC;IACP,gCAAgC;IAChC,WAAW,EAAE,CAAC,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,gBAAgB,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC,CAAC,QAAQ,EAAE;CACpG,CAAC,CACH,CAAC;AAaF;;;;GAIG;AACH,MAAM,UAAU,yBAAyB,CAAC,OAAqC;IAC7E,MAAM,IAAI,GAAG,SAAS,CAAC,oBAAoB,CAAC,OAAO,CAAC,CAAC;IAErD,OAAO;QACL,GAAG,IAAI;QACP,EAAE,EAAE,OAAO,CAAC,EAAE,IAAI,SAAS;QAC3B,GAAG,EAAE,OAAO,CAAC,GAAG,IAAI,SAAS;QAC7B,UAAU,EAAG,OAAO,CAAC,WAA4C,IAAI,gBAAgB,CAAC,GAAG;KAC1F,CAAC;AACJ,CAAC"}

package/package.json

@@ -2,7 +2,7 @@
   "name": "@powersync/service-module-mongodb",
   "repository": "https://github.com/powersync-ja/powersync-service",
   "types": "dist/index.d.ts",
-  "version": "0.13.2",
+  "version": "0.14.0",
   "main": "dist/index.js",
   "license": "FSL-1.1-ALv2",
   "type": "module",
@@ -25,17 +25,17 @@
     "bson": "^6.10.4",
     "ts-codec": "^1.3.0",
     "uuid": "^11.1.0",
-    "@powersync/lib-service-mongodb": "0.6.19",
-    "@powersync/lib-services-framework": "0.8.2",
-    "@powersync/service-core": "1.19.2",
+    "@powersync/lib-service-mongodb": "0.6.20",
+    "@powersync/lib-services-framework": "0.8.3",
+    "@powersync/service-core": "1.20.0",
     "@powersync/service-jsonbig": "0.17.12",
-    "@powersync/service-sync-rules": "0.31.1",
-    "@powersync/service-types": "0.14.0"
+    "@powersync/service-sync-rules": "0.32.0",
+    "@powersync/service-types": "0.15.0"
   },
   "devDependencies": {
-    "@powersync/service-core-tests": "0.13.2",
-    "@powersync/service-module-mongodb-storage": "0.13.2",
-    "@powersync/service-module-postgres-storage": "0.11.2"
+    "@powersync/service-core-tests": "0.14.0",
+    "@powersync/service-module-mongodb-storage": "0.14.0",
+    "@powersync/service-module-postgres-storage": "0.12.0"
   },
   "scripts": {
     "build": "tsc -b",

package/src/replication/MongoManager.ts

@@ -20,6 +20,8 @@ export class MongoManager extends BaseObserver<MongoManagerListener> {
     overrides?: mongo.MongoClientOptions
   ) {
     super();
+    const params = options.connectionParams;
+
     // The pool is lazy - no connections are opened until a query is performed.
     this.client = new mongo.MongoClient(options.uri, {
       auth: {
@@ -28,12 +30,12 @@ export class MongoManager extends BaseObserver<MongoManagerListener> {
       },
 
       lookup: options.lookup,
-      // Time for connection to timeout
-      connectTimeoutMS: 5_000,
-      // Time for individual requests to timeout
-      socketTimeoutMS: 60_000,
-      // How long to wait for new primary selection
-      serverSelectionTimeoutMS: 30_000,
+      // Time for connection to timeout (URL param overrides default)
+      connectTimeoutMS: params.connectTimeoutMS ?? 5_000,
+      // Time for individual requests to timeout (URL param overrides default)
+      socketTimeoutMS: params.socketTimeoutMS ?? 60_000,
+      // How long to wait for new primary selection (URL param overrides default)
+      serverSelectionTimeoutMS: params.serverSelectionTimeoutMS ?? 30_000,
 
       // Identify the client
       appName: `powersync ${POWERSYNC_VERSION}`,
@@ -47,10 +49,10 @@ export class MongoManager extends BaseObserver<MongoManagerListener> {
       // Avoid too many connections:
       // 1. It can overwhelm the source database.
       // 2. Processing too many queries in parallel can cause the process to run out of memory.
-      maxPoolSize: 8,
+      maxPoolSize: params.maxPoolSize ?? 8,
 
       maxConnecting: 3,
-      maxIdleTimeMS: 60_000,
+      maxIdleTimeMS: params.maxIdleTimeMS ?? 60_000,
 
       ...BSON_DESERIALIZE_DATA_OPTIONS,
 

package/src/types/types.ts

@@ -1,4 +1,5 @@
 import * as lib_mongo from '@powersync/lib-service-mongodb/types';
+import type { MongoConnectionParams } from '@powersync/lib-service-mongodb/types';
 import * as service_types from '@powersync/service-types';
 import { LookupFunction } from 'node:net';
 import * as t from 'ts-codec';
@@ -52,6 +53,8 @@ export interface NormalizedMongoConnectionConfig {
   lookup?: LookupFunction;
 
   postImages: PostImagesOption;
+
+  connectionParams: MongoConnectionParams;
 }
 
 export const MongoConnectionConfig = service_types.configFile.DataSourceConfig.and(lib_mongo.BaseMongoConfig).and(

package/test/src/change_stream.test.ts

@@ -3,12 +3,11 @@ import { setTimeout } from 'node:timers/promises';
 import { describe, expect, test, vi } from 'vitest';
 
 import { mongo } from '@powersync/lib-service-mongodb';
-import { storage } from '@powersync/service-core';
 import { test_utils } from '@powersync/service-core-tests';
 
 import { PostImagesOption } from '@module/types/types.js';
 import { ChangeStreamTestContext } from './change_stream_utils.js';
-import { describeWithStorage } from './util.js';
+import { describeWithStorage, StorageVersionTestContext } from './util.js';
 
 const BASIC_SYNC_RULES = `
 bucket_definitions:
@@ -21,9 +20,12 @@ describe('change stream', () => {
   describeWithStorage({ timeout: 20_000 }, defineChangeStreamTests);
 });
 
-function defineChangeStreamTests(factory: storage.TestStorageFactory) {
+function defineChangeStreamTests({ factory, storageVersion }: StorageVersionTestContext) {
+  const openContext = (options?: Parameters<typeof ChangeStreamTestContext.open>[1]) => {
+    return ChangeStreamTestContext.open(factory, { ...options, storageVersion });
+  };
   test('replicating basic values', async () => {
-    await using context = await ChangeStreamTestContext.open(factory, {
+    await using context = await openContext({
       mongoOptions: { postImages: PostImagesOption.READ_ONLY }
     });
     const { db } = context;
@@ -59,7 +61,7 @@ bucket_definitions:
   });
 
   test('replicating wildcard', async () => {
-    await using context = await ChangeStreamTestContext.open(factory);
+    await using context = await openContext();
     const { db } = context;
     await context.updateSyncRules(`
 bucket_definitions:
@@ -91,7 +93,7 @@ bucket_definitions:
   });
 
   test('updateLookup - no fullDocument available', async () => {
-    await using context = await ChangeStreamTestContext.open(factory, {
+    await using context = await openContext({
       mongoOptions: { postImages: PostImagesOption.OFF }
     });
     const { db, client } = context;
@@ -137,7 +139,7 @@ bucket_definitions:
   test('postImages - autoConfigure', async () => {
     // Similar to the above test, but with postImages enabled.
     // This resolves the consistency issue.
-    await using context = await ChangeStreamTestContext.open(factory, {
+    await using context = await openContext({
       mongoOptions: { postImages: PostImagesOption.AUTO_CONFIGURE }
     });
     const { db, client } = context;
@@ -185,7 +187,7 @@ bucket_definitions:
   test('postImages - on', async () => {
     // Similar to postImages - autoConfigure, but does not auto-configure.
     // changeStreamPreAndPostImages must be manually configured.
-    await using context = await ChangeStreamTestContext.open(factory, {
+    await using context = await openContext({
       mongoOptions: { postImages: PostImagesOption.READ_ONLY }
     });
     const { db, client } = context;
@@ -230,7 +232,7 @@ bucket_definitions:
   });
 
   test('replicating case sensitive table', async () => {
-    await using context = await ChangeStreamTestContext.open(factory);
+    await using context = await openContext();
     const { db } = context;
     await context.updateSyncRules(`
       bucket_definitions:
@@ -254,7 +256,7 @@ bucket_definitions:
   });
 
   test('replicating large values', async () => {
-    await using context = await ChangeStreamTestContext.open(factory);
+    await using context = await openContext();
     const { db } = context;
     await context.updateSyncRules(`
       bucket_definitions:
@@ -285,7 +287,7 @@ bucket_definitions:
   });
 
   test('replicating dropCollection', async () => {
-    await using context = await ChangeStreamTestContext.open(factory);
+    await using context = await openContext();
     const { db } = context;
     const syncRuleContent = `
 bucket_definitions:
@@ -317,7 +319,7 @@ bucket_definitions:
   });
 
   test('replicating renameCollection', async () => {
-    await using context = await ChangeStreamTestContext.open(factory);
+    await using context = await openContext();
     const { db } = context;
     const syncRuleContent = `
 bucket_definitions:
@@ -348,7 +350,7 @@ bucket_definitions:
   });
 
   test('initial sync', async () => {
-    await using context = await ChangeStreamTestContext.open(factory);
+    await using context = await openContext();
     const { db } = context;
     await context.updateSyncRules(BASIC_SYNC_RULES);
 
@@ -373,7 +375,7 @@ bucket_definitions:
     // MongoServerError: PlanExecutor error during aggregation :: caused by :: BSONObj size: 33554925 (0x20001ED) is invalid.
     // Size must be between 0 and 16793600(16MB)
 
-    await using context = await ChangeStreamTestContext.open(factory);
+    await using context = await openContext();
     await context.updateSyncRules(`bucket_definitions:
       global:
         data:
@@ -422,7 +424,7 @@ bucket_definitions:
   });
 
   test('collection not in sync rules', async () => {
-    await using context = await ChangeStreamTestContext.open(factory);
+    await using context = await openContext();
     const { db } = context;
     await context.updateSyncRules(BASIC_SYNC_RULES);
 
@@ -439,7 +441,7 @@ bucket_definitions:
   });
 
   test('postImages - new collection with postImages enabled', async () => {
-    await using context = await ChangeStreamTestContext.open(factory, {
+    await using context = await openContext({
       mongoOptions: { postImages: PostImagesOption.AUTO_CONFIGURE }
     });
     const { db } = context;
@@ -472,7 +474,7 @@ bucket_definitions:
   });
 
   test('postImages - new collection with postImages disabled', async () => {
-    await using context = await ChangeStreamTestContext.open(factory, {
+    await using context = await openContext({
       mongoOptions: { postImages: PostImagesOption.AUTO_CONFIGURE }
     });
     const { db } = context;
@@ -502,7 +504,7 @@ bucket_definitions:
   });
 
   test('recover from error', async () => {
-    await using context = await ChangeStreamTestContext.open(factory);
+    await using context = await openContext();
     const { db } = context;
     await context.updateSyncRules(`
 bucket_definitions:

package/test/src/change_stream_utils.ts

@@ -4,11 +4,15 @@ import {
   createCoreReplicationMetrics,
   initializeCoreReplicationMetrics,
   InternalOpId,
+  LEGACY_STORAGE_VERSION,
   OplogEntry,
   ProtocolOpId,
   ReplicationCheckpoint,
+  STORAGE_VERSION_CONFIG,
   SyncRulesBucketStorage,
-  TestStorageOptions
+  TestStorageOptions,
+  updateSyncRulesFromYaml,
+  utils
 } from '@powersync/service-core';
 import { METRICS_HELPER, test_utils } from '@powersync/service-core-tests';
 
@@ -23,6 +27,7 @@ export class ChangeStreamTestContext {
   private _walStream?: ChangeStream;
   private abortController = new AbortController();
   private streamPromise?: Promise<void>;
+  private syncRulesId?: number;
   public storage?: SyncRulesBucketStorage;
 
   /**
@@ -35,6 +40,7 @@ export class ChangeStreamTestContext {
     factory: (options: TestStorageOptions) => Promise<BucketStorageFactory>,
     options?: {
       doNotClear?: boolean;
+      storageVersion?: number;
       mongoOptions?: Partial<NormalizedMongoConnectionConfig>;
       streamOptions?: Partial<ChangeStreamOptions>;
     }
@@ -45,13 +51,19 @@ export class ChangeStreamTestContext {
     if (!options?.doNotClear) {
       await clearTestDb(connectionManager.db);
     }
-    return new ChangeStreamTestContext(f, connectionManager, options?.streamOptions);
+
+    const storageVersion = options?.storageVersion ?? LEGACY_STORAGE_VERSION;
+    const versionedBuckets = STORAGE_VERSION_CONFIG[storageVersion]?.versionedBuckets ?? false;
+
+    return new ChangeStreamTestContext(f, connectionManager, options?.streamOptions, storageVersion, versionedBuckets);
   }
 
   constructor(
     public factory: BucketStorageFactory,
     public connectionManager: MongoManager,
-    private streamOptions?: Partial<ChangeStreamOptions>
+    private streamOptions: Partial<ChangeStreamOptions> = {},
+    private storageVersion: number = LEGACY_STORAGE_VERSION,
+    private versionedBuckets: boolean = STORAGE_VERSION_CONFIG[storageVersion]?.versionedBuckets ?? false
   ) {
     createCoreReplicationMetrics(METRICS_HELPER.metricsEngine);
     initializeCoreReplicationMetrics(METRICS_HELPER.metricsEngine);
@@ -88,7 +100,10 @@ export class ChangeStreamTestContext {
   }
 
   async updateSyncRules(content: string) {
-    const syncRules = await this.factory.updateSyncRules({ content: content, validate: true });
+    const syncRules = await this.factory.updateSyncRules(
+      updateSyncRulesFromYaml(content, { validate: true, storageVersion: this.storageVersion })
+    );
+    this.syncRulesId = syncRules.id;
     this.storage = this.factory.getInstance(syncRules);
     return this.storage!;
   }
@@ -99,6 +114,7 @@ export class ChangeStreamTestContext {
       throw new Error(`Next sync rules not available`);
     }
 
+    this.syncRulesId = syncRules.id;
     this.storage = this.factory.getInstance(syncRules);
     return this.storage!;
   }
@@ -159,9 +175,21 @@ export class ChangeStreamTestContext {
     return checkpoint;
   }
 
+  private resolveBucketName(bucket: string) {
+    if (!this.versionedBuckets || /^\d+#/.test(bucket)) {
+      return bucket;
+    }
+    if (this.syncRulesId == null) {
+      throw new Error('Sync rules not configured - call updateSyncRules() first');
+    }
+    return `${this.syncRulesId}#${bucket}`;
+  }
+
   async getBucketsDataBatch(buckets: Record<string, InternalOpId>, options?: { timeout?: number }) {
     let checkpoint = await this.getCheckpoint(options);
-    const map = new Map<string, InternalOpId>(Object.entries(buckets));
+    const map = new Map<string, InternalOpId>(
+      Object.entries(buckets).map(([bucket, opId]) => [this.resolveBucketName(bucket), opId])
+    );
     return test_utils.fromAsync(this.storage!.getBucketDataBatch(checkpoint, map));
   }
 
@@ -170,8 +198,9 @@ export class ChangeStreamTestContext {
     if (typeof start == 'string') {
       start = BigInt(start);
     }
+    const resolvedBucket = this.resolveBucketName(bucket);
     const checkpoint = await this.getCheckpoint(options);
-    const map = new Map<string, InternalOpId>([[bucket, start]]);
+    const map = new Map<string, InternalOpId>([[resolvedBucket, start]]);
     let data: OplogEntry[] = [];
     while (true) {
       const batch = this.storage!.getBucketDataBatch(checkpoint, map);
@@ -181,20 +210,26 @@ export class ChangeStreamTestContext {
       if (batches.length == 0 || !batches[0]!.chunkData.has_more) {
         break;
       }
-      map.set(bucket, BigInt(batches[0]!.chunkData.next_after));
+      map.set(resolvedBucket, BigInt(batches[0]!.chunkData.next_after));
     }
     return data;
   }
 
-  async getChecksums(buckets: string[], options?: { timeout?: number }) {
+  async getChecksums(buckets: string[], options?: { timeout?: number }): Promise<utils.ChecksumMap> {
     let checkpoint = await this.getCheckpoint(options);
-    return this.storage!.getChecksums(checkpoint, buckets);
+    const versionedBuckets = buckets.map((bucket) => this.resolveBucketName(bucket));
+    const checksums = await this.storage!.getChecksums(checkpoint, versionedBuckets);
+
+    const unversioned: utils.ChecksumMap = new Map();
+    for (let i = 0; i < buckets.length; i++) {
+      unversioned.set(buckets[i], checksums.get(versionedBuckets[i])!);
+    }
+    return unversioned;
   }
 
   async getChecksum(bucket: string, options?: { timeout?: number }) {
-    let checkpoint = await this.getCheckpoint(options);
-    const map = await this.storage!.getChecksums(checkpoint, [bucket]);
-    return map.get(bucket);
+    const checksums = await this.getChecksums([bucket], options);
+    return checksums.get(bucket);
   }
 }
 

package/test/src/chunked_snapshot.test.ts

@@ -1,18 +1,22 @@
 import { mongo } from '@powersync/lib-service-mongodb';
-import { reduceBucket, TestStorageFactory } from '@powersync/service-core';
+import { reduceBucket } from '@powersync/service-core';
 import { METRICS_HELPER } from '@powersync/service-core-tests';
 import { JSONBig } from '@powersync/service-jsonbig';
 import { SqliteJsonValue } from '@powersync/service-sync-rules';
 import * as timers from 'timers/promises';
 import { describe, expect, test } from 'vitest';
 import { ChangeStreamTestContext } from './change_stream_utils.js';
-import { describeWithStorage } from './util.js';
+import { describeWithStorage, StorageVersionTestContext } from './util.js';
 
 describe('chunked snapshots', () => {
   describeWithStorage({ timeout: 120_000 }, defineBatchTests);
 });
 
-function defineBatchTests(factory: TestStorageFactory) {
+function defineBatchTests({ factory, storageVersion }: StorageVersionTestContext) {
+  const openContext = (options?: Parameters<typeof ChangeStreamTestContext.open>[1]) => {
+    return ChangeStreamTestContext.open(factory, { ...options, storageVersion });
+  };
+
   // This is not as sensitive to the id type as postgres, but we still test a couple of cases
   test('chunked snapshot (int32)', async () => {
     await testChunkedSnapshot({
@@ -93,7 +97,7 @@ function defineBatchTests(factory: TestStorageFactory) {
     const idToSqlite = options.idToSqlite ?? ((n) => n);
     const idToString = (id: any) => String(idToSqlite(id));
 
-    await using context = await ChangeStreamTestContext.open(factory, {
+    await using context = await openContext({
       // We need to use a smaller chunk size here, so that we can run a query in between chunks
       streamOptions: { snapshotChunkLength: 100 }
     });

package/test/src/resume.test.ts

@@ -1,19 +1,22 @@
 import { ChangeStreamInvalidatedError } from '@module/replication/ChangeStream.js';
 import { MongoManager } from '@module/replication/MongoManager.js';
 import { normalizeConnectionConfig } from '@module/types/types.js';
-import { BucketStorageFactory, TestStorageOptions } from '@powersync/service-core';
 import { describe, expect, test } from 'vitest';
 import { ChangeStreamTestContext } from './change_stream_utils.js';
 import { env } from './env.js';
-import { describeWithStorage } from './util.js';
+import { describeWithStorage, StorageVersionTestContext } from './util.js';
 
 describe('mongodb resuming replication', () => {
   describeWithStorage({}, defineResumeTest);
 });
 
-function defineResumeTest(factoryGenerator: (options?: TestStorageOptions) => Promise<BucketStorageFactory>) {
+function defineResumeTest({ factory: factoryGenerator, storageVersion }: StorageVersionTestContext) {
+  const openContext = (options?: Parameters<typeof ChangeStreamTestContext.open>[1]) => {
+    return ChangeStreamTestContext.open(factoryGenerator, { ...options, storageVersion });
+  };
+
   test('resuming with a different source database', async () => {
-    await using context = await ChangeStreamTestContext.open(factoryGenerator);
+    await using context = await openContext();
     const { db } = context;
 
     await context.updateSyncRules(/* yaml */
@@ -53,7 +56,7 @@ function defineResumeTest(factoryGenerator: (options?: TestStorageOptions) => Pr
     const factory = await factoryGenerator({ doNotClear: true });
 
     // Create a new context without updating the sync rules
-    await using context2 = new ChangeStreamTestContext(factory, connectionManager);
+    await using context2 = new ChangeStreamTestContext(factory, connectionManager, {}, storageVersion);
     const activeContent = await factory.getActiveSyncRulesContent();
     context2.storage = factory.getInstance(activeContent!);
 

package/test/src/resuming_snapshots.test.ts

@@ -8,19 +8,19 @@ import { env } from './env.js';
 import { describeWithStorage } from './util.js';
 
 describe.skipIf(!(env.CI || env.SLOW_TESTS))('batch replication', function () {
-  describeWithStorage({ timeout: 240_000 }, function (factory) {
+  describeWithStorage({ timeout: 240_000 }, function ({ factory, storageVersion }) {
     test('resuming initial replication (1)', async () => {
       // Stop early - likely to not include deleted row in first replication attempt.
-      await testResumingReplication(factory, 2000);
+      await testResumingReplication(factory, storageVersion, 2000);
     });
     test('resuming initial replication (2)', async () => {
       // Stop late - likely to include deleted row in first replication attempt.
-      await testResumingReplication(factory, 8000);
+      await testResumingReplication(factory, storageVersion, 8000);
     });
   });
 });
 
-async function testResumingReplication(factory: TestStorageFactory, stopAfter: number) {
+async function testResumingReplication(factory: TestStorageFactory, storageVersion: number, stopAfter: number) {
   // This tests interrupting and then resuming initial replication.
   // We interrupt replication after test_data1 has fully replicated, and
   // test_data2 has partially replicated.
@@ -35,7 +35,10 @@ async function testResumingReplication(factory: TestStorageFactory, stopAfter: n
   let startRowCount: number;
 
   {
-    await using context = await ChangeStreamTestContext.open(factory, { streamOptions: { snapshotChunkLength: 1000 } });
+    await using context = await ChangeStreamTestContext.open(factory, {
+      storageVersion,
+      streamOptions: { snapshotChunkLength: 1000 }
+    });
 
     await context.updateSyncRules(`bucket_definitions:
   global:
@@ -87,6 +90,7 @@ async function testResumingReplication(factory: TestStorageFactory, stopAfter: n
     // Bypass the usual "clear db on factory open" step.
     await using context2 = await ChangeStreamTestContext.open(factory, {
       doNotClear: true,
+      storageVersion,
       streamOptions: { snapshotChunkLength: 1000 }
     });
 

package/test/src/slow_tests.test.ts

@@ -2,19 +2,21 @@ import { setTimeout } from 'node:timers/promises';
 import { describe, expect, test } from 'vitest';
 
 import { mongo } from '@powersync/lib-service-mongodb';
-import { storage } from '@powersync/service-core';
-
 import { ChangeStreamTestContext, setSnapshotHistorySeconds } from './change_stream_utils.js';
 import { env } from './env.js';
-import { describeWithStorage } from './util.js';
+import { describeWithStorage, StorageVersionTestContext } from './util.js';
 
 describe.runIf(env.CI || env.SLOW_TESTS)('change stream slow tests', { timeout: 60_000 }, function () {
   describeWithStorage({}, defineSlowTests);
 });
 
-function defineSlowTests(factory: storage.TestStorageFactory) {
+function defineSlowTests({ factory, storageVersion }: StorageVersionTestContext) {
+  const openContext = (options?: Parameters<typeof ChangeStreamTestContext.open>[1]) => {
+    return ChangeStreamTestContext.open(factory, { ...options, storageVersion });
+  };
+
   test('replicating snapshot with lots of data', async () => {
-    await using context = await ChangeStreamTestContext.open(factory);
+    await using context = await openContext();
     // Test with low minSnapshotHistoryWindowInSeconds, to trigger:
     // > Read timestamp .. is older than the oldest available timestamp.
     // This happened when we had {snapshot: true} in the initial
@@ -52,7 +54,7 @@ bucket_definitions:
     // changestream), we may miss updates, which this test would
     // hopefully catch.
 
-    await using context = await ChangeStreamTestContext.open(factory);
+    await using context = await openContext();
     const { db } = context;
     await context.updateSyncRules(`
 bucket_definitions: