Upgrade MongoDB driver

.changeset/perfect-kiwis-prove.md

@@ -0,0 +1,10 @@
+---
+'@powersync/service-module-mongodb-storage': patch
+'@powersync/service-rsocket-router': patch
+'@powersync/service-module-mongodb': patch
+'@powersync/service-core': patch
+'@powersync/lib-services-framework': patch
+'@powersync/lib-service-mongodb': patch
+---
+
+Upgrade mongodb driver to improve stability.

libs/lib-mongodb/package.json

@@ -29,10 +29,10 @@
   },
   "dependencies": {
     "@powersync/lib-services-framework": "workspace:*",
-    "bson": "^6.10.3",
-    "mongodb": "^6.14.1",
+    "bson": "^6.10.4",
+    "mongodb": "^6.20.0",
     "mongodb-connection-string-url": "^3.0.2",
     "ts-codec": "^1.3.0"
   },
   "devDependencies": {}
-}
+}

libs/lib-mongodb/src/db/mongo.ts

@@ -61,6 +61,7 @@ export function createMongoClient(config: BaseMongoConfigDecoded, options?: Mong
 
     // Identify the client
     appName: options?.powersyncVersion ? `powersync-storage ${options.powersyncVersion}` : 'powersync-storage',
+    // Deprecated in the driver - in a future release we may have to rely on appName only.
     driverInfo: {
       // This is merged with the node driver info.
       name: 'powersync-storage',

libs/lib-services/package.json

@@ -24,7 +24,7 @@
     "@powersync/service-sync-rules": "workspace:*",
     "ajv": "^8.12.0",
     "better-ajv-errors": "^1.2.0",
-    "bson": "^6.10.3",
+    "bson": "^6.10.4",
     "dotenv": "^16.4.5",
     "ipaddr.js": "^2.1.0",
     "lodash": "^4.17.21",
@@ -37,4 +37,4 @@
     "@types/lodash": "^4.17.5",
     "vitest": "^3.2.4"
   }
-}
+}

modules/module-mongodb-storage/package.json

@@ -34,7 +34,7 @@
     "@powersync/service-jsonbig": "workspace:*",
     "@powersync/service-sync-rules": "workspace:*",
     "@powersync/service-types": "workspace:*",
-    "bson": "^6.10.3",
+    "bson": "^6.10.4",
     "ix": "^5.0.0",
     "lru-cache": "^10.2.2",
     "ts-codec": "^1.3.0",
@@ -43,4 +43,4 @@
   "devDependencies": {
     "@powersync/service-core-tests": "workspace:*"
   }
-}
+}

modules/module-mongodb-storage/src/storage/implementation/MongoCompactor.ts

@@ -184,7 +184,11 @@ export class MongoCompactor {
             }
           }
         ],
-        { batchSize: this.moveBatchQueryLimit }
+        {
+          // batchSize is 1 more than limit to auto-close the cursor.
+          // See https://github.com/mongodb/node-mongodb-native/pull/4580
+          batchSize: this.moveBatchQueryLimit + 1
+        }
       );
       // We don't limit to a single batch here, since that often causes MongoDB to scan through more than it returns.
       // Instead, we load up to the limit.

modules/module-mongodb-storage/src/storage/implementation/MongoSyncBucketStorage.ts

@@ -403,7 +403,9 @@ export class MongoSyncBucketStorage
         limit: batchLimit,
         // Increase batch size above the default 101, so that we can fill an entire batch in
         // one go.
-        batchSize: batchLimit,
+        // batchSize is 1 more than limit to auto-close the cursor.
+        // See https://github.com/mongodb/node-mongodb-native/pull/4580
+        batchSize: batchLimit + 1,
         // Raw mode is returns an array of Buffer instead of parsed documents.
         // We use it so that:
         // 1. We can calculate the document size accurately without serializing again.
@@ -905,7 +907,9 @@ export class MongoSyncBucketStorage
             '_id.b': 1
           },
           limit: limit + 1,
-          batchSize: limit + 1,
+          // batchSize is 1 more than limit to auto-close the cursor.
+          // See https://github.com/mongodb/node-mongodb-native/pull/4580
+          batchSize: limit + 2,
           singleBatch: true
         }
       )
@@ -935,7 +939,9 @@ export class MongoSyncBucketStorage
             lookup: 1
           },
           limit: limit + 1,
-          batchSize: limit + 1,
+          // batchSize is 1 more than limit to auto-close the cursor.
+          // See https://github.com/mongodb/node-mongodb-native/pull/4580
+          batchSize: limit + 2,
           singleBatch: true
         }
       )

modules/module-mongodb-storage/src/storage/implementation/MongoWriteCheckpointAPI.ts

@@ -111,7 +111,9 @@ export class MongoWriteCheckpointAPI implements storage.WriteCheckpointAPI {
         },
         {
           limit: limit + 1,
-          batchSize: limit + 1,
+          // batchSize is 1 more than limit to auto-close the cursor.
+          // See https://github.com/mongodb/node-mongodb-native/pull/4580
+          batchSize: limit + 2,
           singleBatch: true
         }
       )
@@ -140,7 +142,9 @@ export class MongoWriteCheckpointAPI implements storage.WriteCheckpointAPI {
         },
         {
           limit: limit + 1,
-          batchSize: limit + 1,
+          // batchSize is 1 more than limit to auto-close the cursor.
+          // See https://github.com/mongodb/node-mongodb-native/pull/4580
+          batchSize: limit + 2,
           singleBatch: true
         }
       )

modules/module-mongodb-storage/src/storage/implementation/util.ts

@@ -41,7 +41,7 @@ export function generateSlotName(prefix: string, sync_rules_id: number) {
  * However, that makes `has_more` detection very difficult, since the cursor is always closed
  * after the first batch. Instead, we do a workaround to only fetch a single batch below.
  *
- * For this to be effective, set batchSize = limit in the find command.
+ * For this to be effective, set batchSize = limit + 1 in the find command.
  */
 export async function readSingleBatch<T>(cursor: mongo.AbstractCursor<T>): Promise<{ data: T[]; hasMore: boolean }> {
   try {

modules/module-mongodb/package.json

@@ -34,7 +34,7 @@
     "@powersync/service-jsonbig": "workspace:*",
     "@powersync/service-sync-rules": "workspace:*",
     "@powersync/service-types": "workspace:*",
-    "bson": "^6.10.3",
+    "bson": "^6.10.4",
     "ts-codec": "^1.3.0",
     "uuid": "^11.1.0"
   },
@@ -43,4 +43,4 @@
     "@powersync/service-module-mongodb-storage": "workspace:*",
     "@powersync/service-module-postgres-storage": "workspace:*"
   }
-}
+}

modules/module-mongodb/src/replication/ChangeStream.ts

@@ -984,8 +984,8 @@ export class ChangeStream {
               // Checkpoint out of order - should never happen with MongoDB.
               // If it does happen, we throw an error to stop the replication - restarting should recover.
               // Since we use batch.lastCheckpointLsn for the next resumeAfter, this should not result in an infinite loop.
-              // This is a workaround for the issue below, but we can keep this as a safety-check even if the issue is fixed.
-              // Driver issue report: https://jira.mongodb.org/browse/NODE-7042
+              // Originally a workaround for https://jira.mongodb.org/browse/NODE-7042.
+              // This has been fixed in the driver in the meantime, but we still keep this as a safety-check.
               throw new ReplicationAssertionError(
                 `Change resumeToken ${(changeDocument._id as any)._data} (${timestampToDate(changeDocument.clusterTime!).toISOString()}) is less than last checkpoint LSN ${batch.lastCheckpointLsn}. Restarting replication.`
               );

modules/module-mongodb/src/replication/MongoManager.ts

@@ -31,6 +31,7 @@ export class MongoManager {
 
       // Identify the client
       appName: `powersync ${POWERSYNC_VERSION}`,
+      // Deprecated in the driver - in a future release we may have to rely on appName only.
       driverInfo: {
         // This is merged with the node driver info.
         name: 'powersync',

modules/module-mongodb/src/replication/MongoSnapshotQuery.ts

@@ -38,9 +38,11 @@ export class ChunkedSnapshotQuery implements AsyncDisposable {
       const filter: mongo.Filter<mongo.Document> =
         this.lastKey == null ? {} : { $expr: { $gt: ['$_id', { $literal: this.lastKey }] } };
       cursor = this.collection.find(filter, {
-        batchSize: this.batchSize,
         readConcern: 'majority',
         limit: this.batchSize,
+        // batchSize is 1 more than limit to auto-close the cursor.
+        // See https://github.com/mongodb/node-mongodb-native/pull/4580
+        batchSize: this.batchSize + 1,
         sort: { _id: 1 }
       });
       newCursor = true;

package.json

@@ -25,7 +25,7 @@
     "@changesets/cli": "^2.27.8",
     "@types/node": "^22.16.2",
     "async": "^3.2.4",
-    "bson": "^6.10.3",
+    "bson": "^6.10.4",
     "concurrently": "^8.2.2",
     "inquirer": "^9.2.7",
     "npm-check-updates": "^17.1.2",

packages/rsocket-router/package.json

@@ -26,7 +26,7 @@
   },
   "devDependencies": {
     "@types/ws": "~8.2.0",
-    "bson": "^6.10.3",
+    "bson": "^6.10.4",
     "rsocket-websocket-client": "1.0.0-alpha.3"
   }
-}
+}

packages/service-core/package.json

@@ -29,7 +29,7 @@
     "@powersync/service-types": "workspace:*",
     "async": "^3.2.4",
     "async-mutex": "^0.5.0",
-    "bson": "^6.10.3",
+    "bson": "^6.10.4",
     "commander": "^12.0.0",
     "cors": "^2.8.5",
     "ipaddr.js": "^2.1.0",
@@ -52,4 +52,4 @@
     "fastify": "^5.4.0",
     "fastify-plugin": "^5.0.1"
   }
-}
+}