Merge branch 'main' into NODE-6473

Author: tadjik1

.evergreen/config.yml

@@ -1860,17 +1860,6 @@ tasks:
             - {key: NODE_LTS_VERSION, value: '22'}
       - func: install dependencies
       - func: run lint checks
-  - name: run-resource-management-async-dispose
-    tags:
-      - resource-management
-    commands:
-      - command: expansions.update
-        type: setup
-        params:
-          updates:
-            - {key: NODE_LTS_VERSION, value: '22'}
-      - func: install dependencies
-      - func: check resource management
   - name: test-explicit-resource-management-feature-integration
     tags:
       - resource-management

.evergreen/generate_evergreen_tasks.js

@@ -510,17 +510,6 @@ SINGLETON_TASKS.push(
         { func: 'run lint checks' }
       ]
     },
-    {
-      name: 'run-resource-management-async-dispose',
-      tags: ['resource-management'],
-      commands: [
-        updateExpansions({
-          NODE_LTS_VERSION: LATEST_LTS
-        }),
-        { func: 'install dependencies' },
-        { func: 'check resource management' }
-      ]
-    },
     {
       name: 'test-explicit-resource-management-feature-integration',
       tags: ['resource-management'],

.evergreen/run-resource-management.sh

@@ -10,8 +10,7 @@
   "dtsRollup": {
     "enabled": true,
     "untrimmedFilePath": "",
-    "publicTrimmedFilePath": "<projectFolder>/<unscopedPackageName>.d.ts",
-    "betaTrimmedFilePath": "<projectFolder>/lib/beta.d.ts"
+    "publicTrimmedFilePath": "<projectFolder>/<unscopedPackageName>.d.ts"
   },
   "tsdocMetadata": {
     "enabled": false

api-extractor.json

@@ -124,7 +124,7 @@
   "scripts": {
     "build:evergreen": "node .evergreen/generate_evergreen_tasks.js",
     "build:ts": "node ./node_modules/typescript/bin/tsc",
-    "build:dts": "npm run build:ts && api-extractor run && node etc/clean_definition_files.cjs && ESLINT_USE_FLAT_CONFIG=false eslint --no-ignore --fix mongodb.d.ts lib/beta.d.ts",
+    "build:dts": "npm run build:ts && api-extractor run && node etc/clean_definition_files.cjs && ESLINT_USE_FLAT_CONFIG=false eslint --no-ignore --fix mongodb.d.ts",
     "build:docs": "./etc/docs/build.ts",
     "build:typedoc": "typedoc",
     "build:nightly": "node ./.github/scripts/nightly.mjs",
@@ -143,7 +143,6 @@
     "check:unit": "nyc mocha test/unit",
     "check:ts": "node ./node_modules/typescript/bin/tsc -v && node ./node_modules/typescript/bin/tsc --noEmit",
     "check:atlas": "nyc mocha --config test/manual/mocharc.js test/manual/atlas_connectivity.test.ts",
-    "check:resource-management": "nyc mocha --config test/manual/mocharc.js test/manual/resource_management.test.ts",
     "check:drivers-atlas-testing": "nyc mocha --config test/mocha_mongodb.js test/atlas/drivers_atlas_testing.test.ts",
     "check:aws": "nyc mocha --config test/mocha_mongodb.js test/integration/auth/mongodb_aws.test.ts",
     "check:oidc-auth": "nyc mocha --config test/mocha_mongodb.js test/integration/auth/auth.spec.test.ts",

package.json

@@ -20,7 +20,6 @@ import type { Topology } from '../sdam/topology';
 import { type Sort } from '../sort';
 import { TimeoutContext } from '../timeout';
 import {
-  applyRetryableWrites,
   getTopology,
   hasAtomicOperators,
   maybeAddIdToDocuments,
@@ -527,15 +526,15 @@ async function executeCommands(
       finalOptions.checkKeys = false;
     }
 
-    if (finalOptions.retryWrites) {
+    if (bulkOperation.retryWrites) {
       if (isUpdateBatch(batch)) {
-        finalOptions.retryWrites =
-          finalOptions.retryWrites && !batch.operations.some(op => op.multi);
+        bulkOperation.retryWrites =
+          bulkOperation.retryWrites && !batch.operations.some(op => op.multi);
       }
 
       if (isDeleteBatch(batch)) {
-        finalOptions.retryWrites =
-          finalOptions.retryWrites && !batch.operations.some(op => op.limit === 0);
+        bulkOperation.retryWrites =
+          bulkOperation.retryWrites && !batch.operations.some(op => op.limit === 0);
       }
     }
 
@@ -859,13 +858,16 @@ export abstract class BulkOperationBase {
   s: BulkOperationPrivate;
   operationId?: number;
   private collection: Collection;
+  /** @internal */
+  retryWrites?: boolean;
 
   /**
    * Create a new OrderedBulkOperation or UnorderedBulkOperation instance
    * @internal
    */
   constructor(collection: Collection, options: BulkWriteOptions, isOrdered: boolean) {
     this.collection = collection;
+    this.retryWrites = collection.db.options?.retryWrites;
     // determine whether bulkOperation is ordered or unordered
     this.isOrdered = isOrdered;
 
@@ -898,10 +900,6 @@ export abstract class BulkOperationBase {
     //   + 1 bytes for null terminator
     const maxKeySize = (maxWriteBatchSize - 1).toString(10).length + 2;
 
-    // Final options for retryable writes
-    let finalOptions = Object.assign({}, options);
-    finalOptions = applyRetryableWrites(finalOptions, collection.db);
-
     // Final results
     const bulkResult: BulkResult = {
       ok: 1,
@@ -943,7 +941,7 @@ export abstract class BulkOperationBase {
       // Topology
       topology,
       // Options
-      options: finalOptions,
+      options: options,
       // BSON options
       bsonOptions: resolveBSONOptions(options),
       // Current operation

src/beta.ts

@@ -17,9 +17,7 @@ import {
 import { MongoClient } from './mongo_client';
 import { type InferIdType, TypedEventEmitter } from './mongo_types';
 import type { AggregateOptions } from './operations/aggregate';
-import type { CollationOptions, OperationParent } from './operations/command';
-import type { ReadPreference } from './read_preference';
-import { type AsyncDisposable, configureResourceManagement } from './resource_management';
+import type { OperationParent } from './operations/command';
 import type { ServerSessionId } from './sessions';
 import { CSOTTimeoutContext, type TimeoutContext } from './timeout';
 import { filterOptions, getTopology, type MongoDBNamespace, squashError } from './utils';
@@ -45,21 +43,6 @@ const NO_RESUME_TOKEN_ERROR =
   'A change stream document has been received that lacks a resume token (_id).';
 const CHANGESTREAM_CLOSED_ERROR = 'ChangeStream is closed';
 
-/**
- * @public
- * @deprecated Please use the ChangeStreamCursorOptions type instead.
- */
-export interface ResumeOptions {
-  startAtOperationTime?: Timestamp;
-  batchSize?: number;
-  maxAwaitTimeMS?: number;
-  collation?: CollationOptions;
-  readPreference?: ReadPreference;
-  resumeAfter?: ResumeToken;
-  startAfter?: ResumeToken;
-  fullDocument?: string;
-}
-
 /**
  * Represents the logical starting point for a new ChangeStream or resuming a ChangeStream on the server.
  * @see https://www.mongodb.com/docs/manual/changeStreams/#std-label-change-stream-resume
@@ -590,13 +573,10 @@ export class ChangeStream<
   implements AsyncDisposable
 {
   /**
-   * @beta
    * @experimental
    * An alias for {@link ChangeStream.close|ChangeStream.close()}.
    */
-  declare [Symbol.asyncDispose]: () => Promise<void>;
-  /** @internal */
-  async asyncDispose() {
+  async [Symbol.asyncDispose]() {
     await this.close();
   }
 
@@ -1106,5 +1086,3 @@ export class ChangeStream<
     }
   }
 }
-
-configureResourceManagement(ChangeStream.prototype);

src/bulk/common.ts

@@ -222,7 +222,7 @@ export async function prepareHandshakeDocument(
   const options = authContext.options;
   const compressors = options.compressors ? options.compressors : [];
   const { serverApi } = authContext.connection;
-  const clientMetadata: Document = await options.extendedMetadata;
+  const clientMetadata: Document = await options.metadata;
 
   const handshakeDoc: HandshakeDocument = {
     [serverApi?.version || options.loadBalanced === true ? 'hello' : LEGACY_HELLO_COMMAND]: 1,

src/change_stream.ts

@@ -138,10 +138,10 @@ export interface ConnectionOptions
   tls: boolean;
   noDelay?: boolean;
   socketTimeoutMS?: number;
+  /** @internal */
   cancellationToken?: CancellationToken;
-  metadata: ClientMetadata;
   /** @internal */
-  extendedMetadata: Promise<Document>;
+  metadata: Promise<ClientMetadata>;
   /** @internal */
   mongoLogger?: MongoLogger | undefined;
 }