Merge branch 'main' into NODE-7298

Author: tadjik1

.evergreen/config.yml

@@ -1877,19 +1877,6 @@ tasks:
       - func: install dependencies
       - func: bootstrap mongo-orchestration
       - func: check resource management feature integration
-  - name: check-types-typescript-next
-    tags:
-      - check-types-typescript-next
-      - typescript-compilation
-    commands:
-      - command: expansions.update
-        type: setup
-        params:
-          updates:
-            - {key: NODE_LTS_VERSION, value: 20.19.0}
-            - {key: TS_VERSION, value: next}
-      - func: install dependencies
-      - func: check types
   - name: check-types-typescript-current
     tags:
       - check-types-typescript-current

.evergreen/generate_evergreen_tasks.js

@@ -532,7 +532,8 @@ function* makeTypescriptTasks() {
     };
   }
 
-  yield makeCheckTypesTask('next');
+  // TODO(NODE-7233): unskip ts@next tests once we adopt Typescript 6.0.
+  // yield makeCheckTypesTask('next');
   yield makeCheckTypesTask('current');
   yield makeCheckTypesTask('5.6');
 

etc/sdam_viz.js

@@ -5,7 +5,7 @@
 // npx ts-node etc/sdam_viz.js -h
 
 const { MongoClient } = require('../src');
-const { now, calculateDurationInMs, arrayStrictEqual, errorStrictEqual } = require('../src/utils');
+const { calculateDurationInMs, arrayStrictEqual, errorStrictEqual, processTimeMS } = require('../src/utils');
 
 const util = require('util');
 const chalk = require('chalk');
@@ -207,7 +207,7 @@ async function scheduleWriteWorkload(client) {
   const currentWriteWorkload = writeWorkloadCounter++;
 
   try {
-    const start = now();
+    const start = processTimeMS();
     await client.db('test').collection('test').insertOne({ a: 42 });
     averageWriteMS = 0.2 * calculateDurationInMs(start) + 0.8 * averageWriteMS;
 

src/cmap/auth/mongo_credentials.ts

@@ -45,7 +45,8 @@ export const DEFAULT_ALLOWED_HOSTS = [
   '*.mongodbgov.net',
   'localhost',
   '127.0.0.1',
-  '::1'
+  '::1',
+  '*.mongo.com'
 ];
 
 /** Error for when the token audience is missing in the environment. */

src/cmap/connection.ts

@@ -47,8 +47,8 @@ import {
   maxWireVersion,
   type MongoDBNamespace,
   noop,
-  now,
   once,
+  processTimeMS,
   squashError,
   uuidV4
 } from '../utils';
@@ -241,7 +241,7 @@ export class Connection extends TypedEventEmitter<ConnectionEvents> {
 
     this.description = new StreamDescription(this.address, options);
     this.generation = options.generation;
-    this.lastUseTime = now();
+    this.lastUseTime = processTimeMS();
 
     this.messageStream = this.socket
       .on('error', this.onSocketError.bind(this))
@@ -299,7 +299,7 @@ export class Connection extends TypedEventEmitter<ConnectionEvents> {
   }
 
   public markAvailable(): void {
-    this.lastUseTime = now();
+    this.lastUseTime = processTimeMS();
   }
 
   private onSocketError(cause: Error) {
@@ -510,7 +510,7 @@ export class Connection extends TypedEventEmitter<ConnectionEvents> {
     const message = this.prepareCommand(ns.db, command, options);
     let started = 0;
     if (this.shouldEmitAndLogCommand) {
-      started = now();
+      started = processTimeMS();
       this.emitAndLogCommand(
         this.monitorCommands,
         Connection.COMMAND_STARTED,

src/cmap/connection_pool.ts

@@ -36,7 +36,7 @@ import {
   List,
   makeCounter,
   noop,
-  now,
+  processTimeMS,
   promiseWithResolvers
 } from '../utils';
 import { connect } from './connect';
@@ -319,7 +319,7 @@ export class ConnectionPool extends TypedEventEmitter<ConnectionPoolEvents> {
    * explicitly destroyed by the new owner.
    */
   async checkOut(options: { timeoutContext: TimeoutContext } & Abortable): Promise<Connection> {
-    const checkoutTime = now();
+    const checkoutTime = processTimeMS();
     this.emitAndLog(
       ConnectionPool.CONNECTION_CHECK_OUT_STARTED,
       new ConnectionCheckOutStartedEvent(this)
@@ -616,7 +616,7 @@ export class ConnectionPool extends TypedEventEmitter<ConnectionPoolEvents> {
 
     this.pending++;
     // This is our version of a "virtual" no-I/O connection as the spec requires
-    const connectionCreatedTime = now();
+    const connectionCreatedTime = processTimeMS();
     this.emitAndLog(
       ConnectionPool.CONNECTION_CREATED,
       new ConnectionCreatedEvent(this, { id: connectOptions.id })

src/cmap/connection_pool_events.ts

@@ -13,7 +13,7 @@ import {
   CONNECTION_READY
 } from '../constants';
 import type { MongoError } from '../error';
-import { now } from '../utils';
+import { processTimeMS } from '../utils';
 import type { Connection } from './connection';
 import type { ConnectionPool, ConnectionPoolOptions } from './connection_pool';
 
@@ -145,7 +145,7 @@ export class ConnectionReadyEvent extends ConnectionPoolMonitoringEvent {
   /** @internal */
   constructor(pool: ConnectionPool, connection: Connection, connectionCreatedEventTime: number) {
     super(pool);
-    this.durationMS = now() - connectionCreatedEventTime;
+    this.durationMS = processTimeMS() - connectionCreatedEventTime;
     this.connectionId = connection.id;
   }
 }
@@ -224,7 +224,7 @@ export class ConnectionCheckOutFailedEvent extends ConnectionPoolMonitoringEvent
     error?: MongoError
   ) {
     super(pool);
-    this.durationMS = now() - checkoutTime;
+    this.durationMS = processTimeMS() - checkoutTime;
     this.reason = reason;
     this.error = error;
   }
@@ -252,7 +252,7 @@ export class ConnectionCheckedOutEvent extends ConnectionPoolMonitoringEvent {
   /** @internal */
   constructor(pool: ConnectionPool, connection: Connection, checkoutTime: number) {
     super(pool);
-    this.durationMS = now() - checkoutTime;
+    this.durationMS = processTimeMS() - checkoutTime;
     this.connectionId = connection.id;
   }
 }

src/db.ts

@@ -394,7 +394,6 @@ export class Db {
         toCollection,
         resolveOptions(undefined, {
           ...options,
-          new_collection: true,
           readPreference: ReadPreference.primary
         })
       ) as TODO_NODE_3286

src/error.ts

@@ -1528,13 +1528,7 @@ export function isNodeShuttingDownError(err: MongoError): boolean {
  *
  * @see https://github.com/mongodb/specifications/blob/master/source/server-discovery-and-monitoring/server-discovery-and-monitoring.md#not-writable-primary-and-node-is-recovering
  */
-export function isSDAMUnrecoverableError(error: MongoError): boolean {
-  // NOTE: null check is here for a strictly pre-CMAP world, a timeout or
-  //       close event are considered unrecoverable
-  if (error instanceof MongoParseError || error == null) {
-    return true;
-  }
-
+export function isStateChangeError(error: MongoError): boolean {
   return isRecoveringError(error) || isNotWritablePrimaryError(error);
 }
 

src/operations/rename.ts

@@ -11,7 +11,12 @@ import { Aspect, defineAspects } from './operation';
 export interface RenameOptions extends Omit<CommandOperationOptions, 'rawData'> {
   /** Drop the target name collection if it previously exists. */
   dropTarget?: boolean;
-  /** Unclear */
+  /**
+   * @deprecated
+   *
+   * This option has been dead code since at least Node driver version 4.x. It will
+   * be removed in a future major release.
+   */
   new_collection?: boolean;
 }