mongodb 6.13.0 → 6.13.1-dev.20250222.sha.421ddeb3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mongodb",
-  "version": "6.13.0",
+  "version": "6.13.1-dev.20250222.sha.421ddeb3",
   "description": "The official MongoDB driver for Node.js",
   "main": "lib/index.js",
   "files": [
@@ -26,11 +26,11 @@
   },
   "dependencies": {
     "@mongodb-js/saslprep": "^1.1.9",
-    "bson": "^6.10.1",
+    "bson": "^6.10.3",
     "mongodb-connection-string-url": "^3.0.0"
   },
   "peerDependencies": {
-    "@aws-sdk/credential-providers": "^3.188.0",
+    "@aws-sdk/credential-providers": "^3.632.0",
     "@mongodb-js/zstd": "^1.1.0 || ^2.0.0",
     "gcp-metadata": "^5.2.0",
     "kerberos": "^2.0.1",
@@ -62,18 +62,18 @@
     }
   },
   "devDependencies": {
-    "@aws-sdk/credential-providers": "^3.686.0",
+    "@aws-sdk/credential-providers": "^3.632.0",
     "@iarna/toml": "^2.2.5",
     "@istanbuljs/nyc-config-typescript": "^1.0.2",
-    "@microsoft/api-extractor": "^7.47.11",
-    "@microsoft/tsdoc-config": "^0.17.0",
+    "@microsoft/api-extractor": "^7.49.2",
+    "@microsoft/tsdoc-config": "^0.17.1",
     "@mongodb-js/zstd": "^2.0.0",
     "@types/chai": "^4.3.17",
     "@types/chai-subset": "^1.3.5",
     "@types/express": "^4.17.21",
     "@types/kerberos": "^1.1.5",
     "@types/mocha": "^10.0.9",
-    "@types/node": "^22.9.0",
+    "@types/node": "^22.13.0",
     "@types/saslprep": "^1.0.3",
     "@types/semver": "^7.5.8",
     "@types/sinon": "^17.0.3",
@@ -87,20 +87,20 @@
     "eslint": "9.9.0",
     "eslint-config-prettier": "^9.1.0",
     "eslint-plugin-mocha": "^10.4.1",
-    "eslint-plugin-prettier": "^5.2.1",
+    "eslint-plugin-prettier": "^5.2.3",
     "eslint-plugin-simple-import-sort": "^12.1.1",
-    "eslint-plugin-tsdoc": "^0.3.0",
+    "eslint-plugin-tsdoc": "^0.4.0",
     "eslint-plugin-unused-imports": "^4.1.4",
-    "express": "^4.21.1",
+    "express": "^4.21.2",
     "gcp-metadata": "^5.3.0",
     "js-yaml": "^4.1.0",
     "mocha": "^10.8.2",
     "mocha-sinon": "^2.1.2",
-    "mongodb-client-encryption": "^6.1.0",
+    "mongodb-client-encryption": "^6.2.0",
     "mongodb-legacy": "^6.1.3",
     "nyc": "^15.1.0",
-    "prettier": "^3.3.3",
-    "semver": "^7.6.3",
+    "prettier": "^3.4.2",
+    "semver": "^7.7.0",
     "sinon": "^18.0.0",
     "sinon-chai": "^3.7.0",
     "snappy": "^7.2.2",
@@ -128,36 +128,35 @@
     "build:docs": "./etc/docs/build.ts",
     "build:typedoc": "typedoc",
     "build:nightly": "node ./.github/scripts/nightly.mjs",
-    "check:bench": "node test/benchmarks/driverBench",
+    "check:bench": "npm --prefix test/benchmarks/driver_bench start",
     "check:coverage": "nyc npm run test:all",
     "check:integration-coverage": "nyc npm run check:test",
-    "check:lambda": "mocha --config test/mocha_lambda.json test/integration/node-specific/examples/handler.test.js",
-    "check:lambda:aws": "mocha --config test/mocha_lambda.json test/integration/node-specific/examples/aws_handler.test.js",
+    "check:lambda": "mocha --config test/mocha_lambda.js test/integration/node-specific/examples/handler.test.js",
+    "check:lambda:aws": "mocha --config test/mocha_lambda.js test/integration/node-specific/examples/aws_handler.test.js",
     "check:lint": "npm run build:dts && npm run check:dts && npm run check:eslint && npm run check:tsd",
     "check:eslint": "npm run build:dts && ESLINT_USE_FLAT_CONFIG=false eslint -v && ESLINT_USE_FLAT_CONFIG=false eslint --max-warnings=0 --ext '.js,.ts' src test",
     "check:tsd": "tsd --version && tsd",
     "check:dependencies": "mocha test/action/dependency.test.ts",
     "check:dts": "node ./node_modules/typescript/bin/tsc --noEmit mongodb.d.ts && tsd",
-    "check:search-indexes": "nyc mocha --config test/mocha_mongodb.json test/manual/search-index-management.prose.test.ts",
-    "check:test": "mocha --config test/mocha_mongodb.json test/integration",
+    "check:search-indexes": "nyc mocha --config test/mocha_mongodb.js test/manual/search-index-management.prose.test.ts",
+    "check:test": "mocha --config test/mocha_mongodb.js test/integration",
     "check:unit": "mocha test/unit",
     "check:ts": "node ./node_modules/typescript/bin/tsc -v && node ./node_modules/typescript/bin/tsc --noEmit",
-    "check:atlas": "mocha --config test/manual/mocharc.json test/manual/atlas_connectivity.test.ts",
-    "check:resource-management": "mocha --config test/manual/mocharc.json test/manual/resource_management.test.ts",
-    "check:drivers-atlas-testing": "mocha --config test/mocha_mongodb.json test/atlas/drivers_atlas_testing.test.ts",
-    "check:adl": "mocha --config test/mocha_mongodb.json test/manual/atlas-data-lake-testing",
-    "check:aws": "nyc mocha --config test/mocha_mongodb.json test/integration/auth/mongodb_aws.test.ts",
-    "check:oidc-auth": "mocha --config test/mocha_mongodb.json test/integration/auth/auth.spec.test.ts",
-    "check:oidc-test": "mocha --config test/mocha_mongodb.json test/integration/auth/mongodb_oidc.prose.test.ts",
-    "check:oidc-azure": "mocha --config test/mocha_mongodb.json test/integration/auth/mongodb_oidc_azure.prose.05.test.ts",
-    "check:oidc-gcp": "mocha --config test/mocha_mongodb.json test/integration/auth/mongodb_oidc_gcp.prose.06.test.ts",
-    "check:oidc-k8s": "mocha --config test/mocha_mongodb.json test/integration/auth/mongodb_oidc_k8s.prose.07.test.ts",
-    "check:ocsp": "mocha --config test/manual/mocharc.json test/manual/ocsp_support.test.js",
-    "check:kerberos": "nyc mocha --config test/manual/mocharc.json test/manual/kerberos.test.ts",
-    "check:tls": "mocha --config test/manual/mocharc.json test/manual/tls_support.test.ts",
-    "check:ldap": "nyc mocha --config test/manual/mocharc.json test/manual/ldap.test.js",
-    "check:socks5": "mocha --config test/manual/mocharc.json test/manual/socks5.test.ts",
-    "check:csfle": "mocha --config test/mocha_mongodb.json test/integration/client-side-encryption",
+    "check:atlas": "mocha --config test/manual/mocharc.js test/manual/atlas_connectivity.test.ts",
+    "check:resource-management": "mocha --config test/manual/mocharc.js test/manual/resource_management.test.ts",
+    "check:drivers-atlas-testing": "mocha --config test/mocha_mongodb.js test/atlas/drivers_atlas_testing.test.ts",
+    "check:adl": "mocha --config test/mocha_mongodb.js test/manual/atlas-data-lake-testing",
+    "check:aws": "nyc mocha --config test/mocha_mongodb.js test/integration/auth/mongodb_aws.test.ts",
+    "check:oidc-auth": "mocha --config test/mocha_mongodb.js test/integration/auth/auth.spec.test.ts",
+    "check:oidc-test": "mocha --config test/mocha_mongodb.js test/integration/auth/mongodb_oidc.prose.test.ts",
+    "check:oidc-azure": "mocha --config test/mocha_mongodb.js test/integration/auth/mongodb_oidc_azure.prose.05.test.ts",
+    "check:oidc-gcp": "mocha --config test/mocha_mongodb.js test/integration/auth/mongodb_oidc_gcp.prose.06.test.ts",
+    "check:oidc-k8s": "mocha --config test/mocha_mongodb.js test/integration/auth/mongodb_oidc_k8s.prose.07.test.ts",
+    "check:kerberos": "nyc mocha --config test/manual/mocharc.js test/manual/kerberos.test.ts",
+    "check:tls": "mocha --config test/manual/mocharc.js test/manual/tls_support.test.ts",
+    "check:ldap": "nyc mocha --config test/manual/mocharc.js test/manual/ldap.test.ts",
+    "check:socks5": "mocha --config test/manual/mocharc.js test/manual/socks5.test.ts",
+    "check:csfle": "mocha --config test/mocha_mongodb.js test/integration/client-side-encryption",
     "check:snappy": "mocha test/unit/assorted/snappy.test.js",
     "check:x509": "mocha test/manual/x509_auth.test.ts",
     "fix:eslint": "npm run check:eslint -- --fix",
@@ -176,4 +175,4 @@
       "moduleResolution": "node"
     }
   }
-}
+}

package/src/change_stream.ts

@@ -951,12 +951,10 @@ export class ChangeStream<
 
   /** @internal */
   private _endStream(): void {
-    const cursorStream = this.cursorStream;
-    if (cursorStream) {
-      ['data', 'close', 'end', 'error'].forEach(event => cursorStream.removeAllListeners(event));
-      cursorStream.destroy();
-    }
-
+    this.cursorStream?.removeAllListeners('data');
+    this.cursorStream?.removeAllListeners('close');
+    this.cursorStream?.removeAllListeners('end');
+    this.cursorStream?.destroy();
     this.cursorStream = undefined;
   }
 

package/src/client-side-encryption/state_machine.ts

@@ -344,7 +344,6 @@ export class StateMachine {
     function destroySockets() {
       for (const sock of [socket, netSocket]) {
         if (sock) {
-          sock.removeAllListeners();
           sock.destroy();
         }
       }

package/src/cmap/auth/mongodb_aws.ts

@@ -148,7 +148,7 @@ export class MongoDBAWS extends AuthProvider {
 
     const saslContinue = {
       saslContinue: 1,
-      conversationId: 1,
+      conversationId: saslStartResponse.conversationId,
       payload: BSON.serialize(payload, bsonOptions)
     };
 

package/src/cmap/connect.ts

@@ -427,7 +427,6 @@ export async function makeSocket(options: MakeConnectionOptions): Promise<Stream
     throw error;
   } finally {
     socket.setTimeout(0);
-    socket.removeAllListeners();
     if (cancellationHandler != null) {
       options.cancellationToken?.removeListener('cancel', cancellationHandler);
     }

package/src/cmap/connection.ts

@@ -46,6 +46,7 @@ import {
   HostAddress,
   maxWireVersion,
   type MongoDBNamespace,
+  noop,
   now,
   once,
   squashError,
@@ -229,6 +230,7 @@ export class Connection extends TypedEventEmitter<ConnectionEvents> {
 
   constructor(stream: Stream, options: ConnectionOptions) {
     super();
+    this.on('error', noop);
 
     this.socket = stream;
     this.id = options.id;

package/src/cmap/connection_pool.ts

@@ -34,6 +34,7 @@ import {
   kDispose,
   List,
   makeCounter,
+  noop,
   now,
   promiseWithResolvers
 } from '../utils';
@@ -200,6 +201,7 @@ export class ConnectionPool extends TypedEventEmitter<ConnectionPoolEvents> {
 
   constructor(server: Server, options: ConnectionPoolOptions) {
     super();
+    this.on('error', noop);
 
     this.options = Object.freeze({
       connectionType: Connection,

package/src/collection.ts

@@ -389,7 +389,7 @@ export class Collection<TSchema extends Document = Document> {
     filter: Filter<TSchema>,
     replacement: WithoutId<TSchema>,
     options?: ReplaceOptions
-  ): Promise<UpdateResult<TSchema> | Document> {
+  ): Promise<UpdateResult<TSchema>> {
     return await executeOperation(
       this.client,
       new ReplaceOneOperation(
@@ -966,32 +966,40 @@ export class Collection<TSchema extends Document = Document> {
   /**
    * Find a document and update it in one atomic operation. Requires a write lock for the duration of the operation.
    *
+   * The value of `update` can be either:
+   * - UpdateFilter<TSchema> - A document that contains update operator expressions,
+   * - Document[] - an aggregation pipeline consisting of the following stages:
+   *   - $addFields and its alias $set
+   *   - $project and its alias $unset
+   *   - $replaceRoot and its alias $replaceWith.
+   * See the [findAndModify command documentation](https://www.mongodb.com/docs/manual/reference/command/findAndModify) for details.
+   *
    * @param filter - The filter used to select the document to update
-   * @param update - Update operations to be performed on the document
+   * @param update - The modifications to apply
    * @param options - Optional settings for the command
    */
   async findOneAndUpdate(
     filter: Filter<TSchema>,
-    update: UpdateFilter<TSchema>,
+    update: UpdateFilter<TSchema> | Document[],
     options: FindOneAndUpdateOptions & { includeResultMetadata: true }
   ): Promise<ModifyResult<TSchema>>;
   async findOneAndUpdate(
     filter: Filter<TSchema>,
-    update: UpdateFilter<TSchema>,
+    update: UpdateFilter<TSchema> | Document[],
     options: FindOneAndUpdateOptions & { includeResultMetadata: false }
   ): Promise<WithId<TSchema> | null>;
   async findOneAndUpdate(
     filter: Filter<TSchema>,
-    update: UpdateFilter<TSchema>,
+    update: UpdateFilter<TSchema> | Document[],
     options: FindOneAndUpdateOptions
   ): Promise<WithId<TSchema> | null>;
   async findOneAndUpdate(
     filter: Filter<TSchema>,
-    update: UpdateFilter<TSchema>
+    update: UpdateFilter<TSchema> | Document[]
   ): Promise<WithId<TSchema> | null>;
   async findOneAndUpdate(
     filter: Filter<TSchema>,
-    update: UpdateFilter<TSchema>,
+    update: UpdateFilter<TSchema> | Document[],
     options?: FindOneAndUpdateOptions
   ): Promise<WithId<TSchema> | ModifyResult<TSchema> | null> {
     return await executeOperation(

package/src/cursor/abstract_cursor.ts

@@ -27,6 +27,7 @@ import {
   type Disposable,
   kDispose,
   type MongoDBNamespace,
+  noop,
   squashError
 } from '../utils';
 
@@ -267,6 +268,7 @@ export abstract class AbstractCursor<
     options: AbstractCursorOptions & Abortable = {}
   ) {
     super();
+    this.on('error', noop);
 
     if (!client.s.isMongoClient) {
       throw new MongoRuntimeError('Cursor must be constructed with MongoClient');

package/src/error.ts

@@ -1,10 +1,10 @@
-import type { Document, ObjectId } from './bson';
+import type { Document } from './bson';
 import {
   type ClientBulkWriteError,
   type ClientBulkWriteResult
 } from './operations/client_bulk_write/common';
 import type { ServerType } from './sdam/common';
-import type { ServerDescription, TopologyVersion } from './sdam/server_description';
+import type { TopologyVersion } from './sdam/server_description';
 import type { TopologyDescription } from './sdam/topology_description';
 
 /** @public */
@@ -355,16 +355,8 @@ export class MongoStalePrimaryError extends MongoRuntimeError {
    *
    * @public
    **/
-  constructor(
-    serverDescription: ServerDescription,
-    maxSetVersion: number | null,
-    maxElectionId: ObjectId | null,
-    options?: { cause?: Error }
-  ) {
-    super(
-      `primary marked stale due to electionId/setVersion mismatch: server setVersion: ${serverDescription.setVersion}, server electionId: ${serverDescription.electionId}, topology setVersion: ${maxSetVersion}, topology electionId: ${maxElectionId}`,
-      options
-    );
+  constructor(message: string, options?: { cause?: Error }) {
+    super(message, options);
   }
 
   override get name(): string {

package/src/gridfs/index.ts

@@ -7,7 +7,7 @@ import { type Filter, TypedEventEmitter } from '../mongo_types';
 import type { ReadPreference } from '../read_preference';
 import type { Sort } from '../sort';
 import { CSOTTimeoutContext } from '../timeout';
-import { resolveOptions } from '../utils';
+import { noop, resolveOptions } from '../utils';
 import { WriteConcern, type WriteConcernOptions } from '../write_concern';
 import type { FindOptions } from './../operations/find';
 import {
@@ -87,6 +87,7 @@ export class GridFSBucket extends TypedEventEmitter<GridFSBucketEvents> {
 
   constructor(db: Db, options?: GridFSBucketOptions) {
     super();
+    this.on('error', noop);
     this.setMaxListeners(0);
     const privateOptions = resolveOptions(db, {
       ...DEFAULT_GRIDFS_BUCKET_OPTIONS,

package/src/mongo_client.ts

@@ -57,6 +57,7 @@ import {
   hostMatchesWildcards,
   isHostMatch,
   type MongoDBNamespace,
+  noop,
   ns,
   resolveOptions,
   squashError
@@ -381,6 +382,7 @@ export class MongoClient extends TypedEventEmitter<MongoClientEvents> implements
 
   constructor(url: string, options?: MongoClientOptions) {
     super();
+    this.on('error', noop);
 
     this.options = parseOptions(url, this, options);
 

package/src/mongo_types.ts

@@ -24,6 +24,7 @@ import {
   type MongoLogger
 } from './mongo_logger';
 import type { Sort } from './sort';
+import { noop } from './utils';
 
 /** @internal */
 export type TODO_NODE_3286 = any;
@@ -472,7 +473,12 @@ export class TypedEventEmitter<Events extends EventsDescription> extends EventEm
 }
 
 /** @public */
-export class CancellationToken extends TypedEventEmitter<{ cancel(): void }> {}
+export class CancellationToken extends TypedEventEmitter<{ cancel(): void }> {
+  constructor(...args: any[]) {
+    super(...args);
+    this.on('error', noop);
+  }
+}
 
 /** @public */
 export type Abortable = {

package/src/sdam/monitor.ts

@@ -13,6 +13,7 @@ import {
   type Callback,
   type EventEmitterWithState,
   makeStateMachine,
+  noop,
   now,
   ns
 } from '../utils';
@@ -102,6 +103,7 @@ export class Monitor extends TypedEventEmitter<MonitorEvents> {
 
   constructor(server: Server, options: MonitorOptions) {
     super();
+    this.on('error', noop);
 
     this.server = server;
     this.connection = null;

package/src/sdam/server.ts

@@ -47,6 +47,7 @@ import {
   makeStateMachine,
   maxWireVersion,
   type MongoDBNamespace,
+  noop,
   supportsRetryableWrites
 } from '../utils';
 import { throwIfWriteConcernError } from '../write_concern';
@@ -142,6 +143,7 @@ export class Server extends TypedEventEmitter<ServerEvents> {
    */
   constructor(topology: Topology, description: ServerDescription, options: ServerOptions) {
     super();
+    this.on('error', noop);
 
     this.serverApi = options.serverApi;
 

package/src/sdam/srv_polling.ts

@@ -3,7 +3,7 @@ import { clearTimeout, setTimeout } from 'timers';
 
 import { MongoRuntimeError } from '../error';
 import { TypedEventEmitter } from '../mongo_types';
-import { checkParentDomainMatch, HostAddress, squashError } from '../utils';
+import { checkParentDomainMatch, HostAddress, noop, squashError } from '../utils';
 
 /**
  * @internal
@@ -49,6 +49,7 @@ export class SrvPoller extends TypedEventEmitter<SrvPollerEvents> {
 
   constructor(options: SrvPollerOptions) {
     super();
+    this.on('error', noop);
 
     if (!options || !options.srvHost) {
       throw new MongoRuntimeError('Options for SrvPoller must exist and include srvHost');

package/src/sdam/topology.ts

@@ -44,6 +44,7 @@ import {
   kDispose,
   List,
   makeStateMachine,
+  noop,
   now,
   ns,
   promiseWithResolvers,
@@ -248,6 +249,7 @@ export class Topology extends TypedEventEmitter<TopologyEvents> {
     options: TopologyOptions
   ) {
     super();
+    this.on('error', noop);
 
     this.client = client;
     // Options should only be undefined in tests, MongoClient will always have defined options

package/src/sdam/topology_description.ts

@@ -376,6 +376,19 @@ function updateRsFromPrimary(
   maxSetVersion: number | null = null,
   maxElectionId: ObjectId | null = null
 ): [TopologyType, string | null, number | null, ObjectId | null] {
+  const setVersionElectionIdMismatch = (
+    serverDescription: ServerDescription,
+    maxSetVersion: number | null,
+    maxElectionId: ObjectId | null
+  ) => {
+    return (
+      `primary marked stale due to electionId/setVersion mismatch:` +
+      ` server setVersion: ${serverDescription.setVersion},` +
+      ` server electionId: ${serverDescription.electionId},` +
+      ` topology setVersion: ${maxSetVersion},` +
+      ` topology electionId: ${maxElectionId}`
+    );
+  };
   setName = setName || serverDescription.setName;
   if (setName !== serverDescription.setName) {
     serverDescriptions.delete(serverDescription.address);
@@ -401,7 +414,9 @@ function updateRsFromPrimary(
       serverDescriptions.set(
         serverDescription.address,
         new ServerDescription(serverDescription.address, undefined, {
-          error: new MongoStalePrimaryError(serverDescription, maxSetVersion, maxElectionId)
+          error: new MongoStalePrimaryError(
+            setVersionElectionIdMismatch(serverDescription, maxSetVersion, maxElectionId)
+          )
         })
       );
 
@@ -419,7 +434,9 @@ function updateRsFromPrimary(
           serverDescriptions.set(
             serverDescription.address,
             new ServerDescription(serverDescription.address, undefined, {
-              error: new MongoStalePrimaryError(serverDescription, maxSetVersion, maxElectionId)
+              error: new MongoStalePrimaryError(
+                setVersionElectionIdMismatch(serverDescription, maxSetVersion, maxElectionId)
+              )
             })
           );
 
@@ -445,7 +462,9 @@ function updateRsFromPrimary(
       serverDescriptions.set(
         address,
         new ServerDescription(server.address, undefined, {
-          error: new MongoStalePrimaryError(serverDescription, maxSetVersion, maxElectionId)
+          error: new MongoStalePrimaryError(
+            'primary marked stale due to discovery of newer primary'
+          )
         })
       );
 

package/src/sessions.ts

@@ -43,6 +43,7 @@ import {
   isPromiseLike,
   List,
   maxWireVersion,
+  noop,
   now,
   squashError,
   uuidV4
@@ -161,6 +162,7 @@ export class ClientSession
     clientOptions: MongoOptions
   ) {
     super();
+    this.on('error', noop);
 
     if (client == null) {
       // TODO(NODE-3483)

package/src/utils.ts

@@ -531,9 +531,11 @@ export function resolveOptions<T extends CommandOperationOptions>(
     if (writeConcern) {
       if (timeoutMS != null) {
         writeConcern = WriteConcern.fromOptions({
-          ...writeConcern,
-          wtimeout: undefined,
-          wtimeoutMS: undefined
+          writeConcern: {
+            ...writeConcern,
+            wtimeout: undefined,
+            wtimeoutMS: undefined
+          }
         });
       }
       result.writeConcern = writeConcern;