Merge branch 'main' into NODE-5920

Author: baileympearson

.evergreen/config.in.yml

@@ -1102,6 +1102,7 @@ functions:
         env:
           PROJECT_DIRECTORY: ${PROJECT_DIRECTORY}
           MONGODB_URI: ${MONGODB_URI}
+          DRIVERS_TOOLS: ${DRIVERS_TOOLS}
         binary: bash
         args:
           - ${PROJECT_DIRECTORY}/.evergreen/run-benchmarks.sh
@@ -1146,7 +1147,7 @@ tasks:
       - func: bootstrap kms servers
       - func: "run serverless tests"
 
-  - name: run-spec-benchmark-tests-node-18-server-6.0
+  - name: run-spec-benchmark-tests-node-server
     tags:
       - run-spec-benchmark-tests
       - performance
@@ -1156,8 +1157,7 @@ tasks:
         type: setup
         params:
           updates:
-            - { key: NODE_LTS_VERSION, value: v18.16.0 }
-            - { key: NPM_VERSION, value: "9" }
+            - { key: NODE_LTS_VERSION, value: v22.11.0 }
             - { key: VERSION, value: v6.0-perf }
             - { key: TOPOLOGY, value: server }
             - { key: AUTH, value: noauth }
@@ -1615,4 +1615,4 @@ buildvariants:
     display_name: Performance Test
     run_on: rhel90-dbx-perf-large
     tasks:
-      - run-spec-benchmark-tests-node-18-server-6.0
+      - run-spec-benchmark-tests-node-server

.evergreen/config.yml

@@ -1064,6 +1064,7 @@ functions:
         env:
           PROJECT_DIRECTORY: ${PROJECT_DIRECTORY}
           MONGODB_URI: ${MONGODB_URI}
+          DRIVERS_TOOLS: ${DRIVERS_TOOLS}
         binary: bash
         args:
           - ${PROJECT_DIRECTORY}/.evergreen/run-benchmarks.sh
@@ -1107,7 +1108,7 @@ tasks:
       - func: install dependencies
       - func: bootstrap kms servers
       - func: run serverless tests
-  - name: run-spec-benchmark-tests-node-18-server-6.0
+  - name: run-spec-benchmark-tests-node-server
     tags:
       - run-spec-benchmark-tests
       - performance
@@ -1117,8 +1118,7 @@ tasks:
         type: setup
         params:
           updates:
-            - {key: NODE_LTS_VERSION, value: v18.16.0}
-            - {key: NPM_VERSION, value: '9'}
+            - {key: NODE_LTS_VERSION, value: v22.11.0}
             - {key: VERSION, value: v6.0-perf}
             - {key: TOPOLOGY, value: server}
             - {key: AUTH, value: noauth}
@@ -4546,7 +4546,7 @@ buildvariants:
     display_name: Performance Test
     run_on: rhel90-dbx-perf-large
     tasks:
-      - run-spec-benchmark-tests-node-18-server-6.0
+      - run-spec-benchmark-tests-node-server
   - name: rhel80-large-gallium
     display_name: rhel8 Node16
     run_on: rhel80-large

.evergreen/run-benchmarks.sh

@@ -1,5 +1,9 @@
 #! /bin/bash
 
+set -o errexit
+set -o xtrace
+set -o nounset
+
 source $DRIVERS_TOOLS/.evergreen/init-node-and-npm-env.sh
 
 export MONGODB_URI=$MONGODB_URI

.evergreen/run-resource-management-feature-integration.sh

@@ -2,6 +2,9 @@
 
 source $DRIVERS_TOOLS/.evergreen/init-node-and-npm-env.sh
 
+echo "node: $(node --version)"
+echo "npm: $(npm --version)"
+
 echo "Building driver..."
 npm pack
 echo "Building driver...finished."

.evergreen/run-serverless-tests.sh

@@ -20,6 +20,7 @@ npx mocha \
   test/integration/sessions/sessions.prose.test.ts \
   test/integration/sessions/sessions.test.ts \
   test/integration/transactions/transactions.spec.test.ts \
+  test/integration/transactions-convenient-api/transactions-convenient-api.spec.test.ts \
   test/integration/transactions/transactions.test.ts \
   test/integration/versioned-api/versioned_api.spec.test.ts \
   test/integration/load-balancers/load_balancers.spec.test.ts \

etc/notes/errors.md

@@ -67,7 +67,7 @@ Children of `MongoError` include:
 ### `MongoDriverError`
 
 This class represents errors which originate in the driver itself or when the user incorrectly uses the driver. This class should **never** be directly instantiated.
-Its children are the main classes of errors that most users will interact with: [**`MongoAPIError`**](#MongoAPIError) and [**`MongoRuntimeError`**](#MongoRuntimeError).
+Its children are the main classes of errors that most users will interact with: [**`MongoAPIError`**](#MongoAPIError), [**`MongoRuntimeError`**](#MongoRuntimeError) and [**`MongoOperationTimeoutError`**](#MongoOperationTimeoutError).
 
 ### `MongoAPIError`
 
@@ -109,6 +109,12 @@ This class should **never** be directly instantiated.
 | **MongoGridFSChunkError**   | Thrown when a malformed or invalid chunk is encountered when reading from a GridFS Stream. |
 | **MongoUnexpectedServerResponseError**   | Thrown when the driver receives a **parsable** response it did not expect from the server. |
 
+### `MongoOperationTimeoutError`
+
+The `MongoOperationTimeoutError` class represents an error that occurs when an operation could not be completed within the specified `timeoutMS`.
+It is generated by the driver in support of the "client side operation timeout" feature and inherits from `MongoDriverError`.
+When `timeoutMS` is enabled `MongoServerErrors` relating to `MaxTimeExpired` errors will be converted to `MongoOperationTimeoutError`.
+
 ### MongoUnexpectedServerResponseError
 
 Intended for the scenario where the MongoDB returns an unexpected response in relation to some state the driver is in.

package-lock.json

@@ -97,7 +97,7 @@
     "mocha": "^10.4.0",
     "mocha-sinon": "^2.1.2",
     "mongodb-client-encryption": "^6.1.0",
-    "mongodb-legacy": "^6.1.0",
+    "mongodb-legacy": "^6.1.3",
     "nyc": "^15.1.0",
     "prettier": "^3.3.3",
     "semver": "^7.6.3",

package.json

@@ -78,7 +78,8 @@ export class Admin {
       new RunAdminCommandOperation(command, {
         ...resolveBSONOptions(options),
         session: options?.session,
-        readPreference: options?.readPreference
+        readPreference: options?.readPreference,
+        timeoutMS: options?.timeoutMS ?? this.s.db.timeoutMS
       })
     );
   }
@@ -154,7 +155,10 @@ export class Admin {
    * @param options - Optional settings for the command
    */
   async listDatabases(options?: ListDatabasesOptions): Promise<ListDatabasesResult> {
-    return await executeOperation(this.s.db.client, new ListDatabasesOperation(this.s.db, options));
+    return await executeOperation(
+      this.s.db.client,
+      new ListDatabasesOperation(this.s.db, { timeoutMS: this.s.db.timeoutMS, ...options })
+    );
   }
 
   /**

src/admin.ts

@@ -19,6 +19,7 @@ import { makeUpdateStatement, UpdateOperation, type UpdateStatement } from '../o
 import type { Server } from '../sdam/server';
 import type { Topology } from '../sdam/topology';
 import type { ClientSession } from '../sessions';
+import { type TimeoutContext } from '../timeout';
 import {
   applyRetryableWrites,
   getTopology,
@@ -500,7 +501,7 @@ export function mergeBatchResults(
 
 async function executeCommands(
   bulkOperation: BulkOperationBase,
-  options: BulkWriteOptions
+  options: BulkWriteOptions & { timeoutContext?: TimeoutContext | null }
 ): Promise<BulkWriteResult> {
   if (bulkOperation.s.batches.length === 0) {
     return new BulkWriteResult(bulkOperation.s.bulkResult, bulkOperation.isOrdered);
@@ -551,7 +552,11 @@ async function executeCommands(
     let thrownError = null;
     let result;
     try {
-      result = await executeOperation(bulkOperation.s.collection.client, operation);
+      result = await executeOperation(
+        bulkOperation.s.collection.client,
+        operation,
+        finalOptions.timeoutContext
+      );
     } catch (error) {
       thrownError = error;
     }
@@ -842,6 +847,9 @@ export interface BulkWriteOptions extends CommandOperationOptions {
   forceServerObjectId?: boolean;
   /** Map of parameter names and values that can be accessed using $$var (requires MongoDB 5.0). */
   let?: Document;
+
+  /** @internal */
+  timeoutContext?: TimeoutContext;
 }
 
 /**
@@ -862,15 +870,19 @@ export class BulkWriteShimOperation extends AbstractOperation {
     return 'bulkWrite' as const;
   }
 
-  async execute(_server: Server, session: ClientSession | undefined): Promise<any> {
+  async execute(
+    _server: Server,
+    session: ClientSession | undefined,
+    timeoutContext: TimeoutContext
+  ): Promise<any> {
     if (this.options.session == null) {
       // An implicit session could have been created by 'executeOperation'
       // So if we stick it on finalOptions here, each bulk operation
       // will use this same session, it'll be passed in the same way
       // an explicit session would be
       this.options.session = session;
     }
-    return await executeCommands(this.bulkOperation, this.options);
+    return await executeCommands(this.bulkOperation, { ...this.options, timeoutContext });
   }
 }
 
@@ -1199,7 +1211,7 @@ export abstract class BulkOperationBase {
     const finalOptions = { ...this.s.options, ...options };
     const operation = new BulkWriteShimOperation(this, finalOptions);
 
-    return await executeOperation(this.s.collection.client, operation);
+    return await executeOperation(this.s.collection.client, operation, finalOptions.timeoutContext);
   }
 
   /**