mongodb 6.5.0 → 6.6.0-dev.20240504.sha.2609953

package/src/mongo_client.ts

@@ -1,7 +1,6 @@
 import { promises as fs } from 'fs';
 import type { TcpNetConnectOpts } from 'net';
 import type { ConnectionOptions as TLSConnectionOptions, TLSSocketOptions } from 'tls';
-import { promisify } from 'util';
 
 import { type BSONSerializeOptions, type Document, resolveBSONOptions } from './bson';
 import { ChangeStream, type ChangeStreamDocument, type ChangeStreamOptions } from './change_stream';
@@ -50,7 +49,8 @@ import {
   isHostMatch,
   type MongoDBNamespace,
   ns,
-  resolveOptions
+  resolveOptions,
+  squashError
 } from './utils';
 import type { W, WriteConcern, WriteConcernSettings } from './write_concern';
 
@@ -120,7 +120,7 @@ export type SupportedNodeConnectionOptions = SupportedTLSConnectionOptions &
 export interface MongoClientOptions extends BSONSerializeOptions, SupportedNodeConnectionOptions {
   /** Specifies the name of the replica set, if the mongod is a member of a replica set. */
   replicaSet?: string;
-  /** @internal This option is in development and currently has no behaviour. */
+  /** @internal TODO(NODE-5688): This option is in development and currently has no behaviour.  */
   timeoutMS?: number;
   /** Enables or disables TLS/SSL for the connection. */
   tls?: boolean;
@@ -469,7 +469,7 @@ export class MongoClient extends TypedEventEmitter<MongoClientEvents> {
    */
   async connect(): Promise<this> {
     if (this.connectionLock) {
-      return this.connectionLock;
+      return await this.connectionLock;
     }
 
     try {
@@ -550,7 +550,7 @@ export class MongoClient extends TypedEventEmitter<MongoClientEvents> {
 
     const topologyConnect = async () => {
       try {
-        await promisify(callback => this.topology?.connect(options, callback))();
+        await this.topology?.connect(options);
       } catch (error) {
         this.topology?.close();
         throw error;
@@ -600,13 +600,17 @@ export class MongoClient extends TypedEventEmitter<MongoClientEvents> {
     if (servers.length !== 0) {
       const endSessions = Array.from(this.s.sessionPool.sessions, ({ id }) => id);
       if (endSessions.length !== 0) {
-        await executeOperation(
-          this,
-          new RunAdminCommandOperation(
-            { endSessions },
-            { readPreference: ReadPreference.primaryPreferred, noResponse: true }
-          )
-        ).catch(() => null); // outcome does not matter;
+        try {
+          await executeOperation(
+            this,
+            new RunAdminCommandOperation(
+              { endSessions },
+              { readPreference: ReadPreference.primaryPreferred, noResponse: true }
+            )
+          );
+        } catch (error) {
+          squashError(error);
+        }
       }
     }
 
@@ -656,7 +660,7 @@ export class MongoClient extends TypedEventEmitter<MongoClientEvents> {
    */
   static async connect(url: string, options?: MongoClientOptions): Promise<MongoClient> {
     const client = new this(url, options);
-    return client.connect();
+    return await client.connect();
   }
 
   /**
@@ -718,8 +722,8 @@ export class MongoClient extends TypedEventEmitter<MongoClientEvents> {
     } finally {
       try {
         await session.endSession();
-      } catch {
-        // We are not concerned with errors from endSession()
+      } catch (error) {
+        squashError(error);
       }
     }
   }
@@ -893,4 +897,6 @@ export interface MongoOptions
    * TODO: NODE-5671 - remove internal flag
    */
   mongodbLogPath?: 'stderr' | 'stdout' | MongoDBLogWritable;
+  /** @internal TODO(NODE-5688): make this public */
+  timeoutMS?: number;
 }

package/src/mongo_logger.ts

@@ -836,7 +836,9 @@ export class MongoLogger {
 
     if (isPromiseLike(this.pendingLog)) {
       this.pendingLog = this.pendingLog
+        // eslint-disable-next-line github/no-then
         .then(() => this.logDestination.write(logMessage))
+        // eslint-disable-next-line github/no-then
         .then(this.clearPendingLog.bind(this), this.logWriteFailureHandler.bind(this));
       return;
     }
@@ -844,6 +846,7 @@ export class MongoLogger {
     try {
       const logResult = this.logDestination.write(logMessage);
       if (isPromiseLike(logResult)) {
+        // eslint-disable-next-line github/no-then
         this.pendingLog = logResult.then(
           this.clearPendingLog.bind(this),
           this.logWriteFailureHandler.bind(this)

package/src/mongo_types.ts

@@ -219,7 +219,7 @@ export type NotAcceptedFields<TSchema, FieldType> = {
 /** @public */
 export type OnlyFieldsOfType<TSchema, FieldType = any, AssignableType = FieldType> = IsAny<
   TSchema[keyof TSchema],
-  Record<string, FieldType>,
+  AssignableType extends FieldType ? Record<string, FieldType> : Record<string, AssignableType>,
   AcceptedFields<TSchema, FieldType, AssignableType> &
     NotAcceptedFields<TSchema, FieldType> &
     Record<string, AssignableType>

package/src/operations/aggregate.ts

@@ -134,7 +134,8 @@ export class AggregateOperation<T = Document> extends CommandOperation<T> {
       command.cursor.batchSize = options.batchSize;
     }
 
-    return super.executeCommand(server, session, command) as TODO_NODE_3286;
+    const res: TODO_NODE_3286 = await super.executeCommand(server, session, command);
+    return res;
   }
 }
 

package/src/operations/command.ts

@@ -152,6 +152,6 @@ export abstract class CommandOperation<T> extends AbstractOperation<T> {
       cmd = decorateWithExplain(cmd, this.explain);
     }
 
-    return server.command(this.ns, cmd, options);
+    return await server.command(this.ns, cmd, options);
   }
 }

package/src/operations/create_collection.ts

@@ -10,7 +10,7 @@ import type { PkFactory } from '../mongo_client';
 import type { Server } from '../sdam/server';
 import type { ClientSession } from '../sessions';
 import { CommandOperation, type CommandOperationOptions } from './command';
-import { CreateIndexOperation } from './indexes';
+import { CreateIndexesOperation } from './indexes';
 import { Aspect, defineAspects } from './operation';
 
 const ILLEGAL_COMMAND_FIELDS = new Set([
@@ -167,7 +167,12 @@ export class CreateCollectionOperation extends CommandOperation<Collection> {
 
     if (encryptedFields) {
       // Create the required index for queryable encryption support.
-      const createIndexOp = new CreateIndexOperation(db, name, { __safeContent__: 1 }, {});
+      const createIndexOp = CreateIndexesOperation.fromIndexSpecification(
+        db,
+        name,
+        { __safeContent__: 1 },
+        {}
+      );
       await createIndexOp.execute(server, session);
     }
 

package/src/operations/delete.ts

@@ -95,7 +95,8 @@ export class DeleteOperation extends CommandOperation<DeleteResult> {
       }
     }
 
-    return super.executeCommand(server, session, command) as TODO_NODE_3286;
+    const res: TODO_NODE_3286 = await super.executeCommand(server, session, command);
+    return res;
   }
 }
 
@@ -108,7 +109,7 @@ export class DeleteOneOperation extends DeleteOperation {
     server: Server,
     session: ClientSession | undefined
   ): Promise<DeleteResult> {
-    const res = (await super.execute(server, session)) as TODO_NODE_3286;
+    const res: TODO_NODE_3286 = await super.execute(server, session);
     if (this.explain) return res;
     if (res.code) throw new MongoServerError(res);
     if (res.writeErrors) throw new MongoServerError(res.writeErrors[0]);
@@ -128,7 +129,7 @@ export class DeleteManyOperation extends DeleteOperation {
     server: Server,
     session: ClientSession | undefined
   ): Promise<DeleteResult> {
-    const res = (await super.execute(server, session)) as TODO_NODE_3286;
+    const res: TODO_NODE_3286 = await super.execute(server, session);
     if (this.explain) return res;
     if (res.code) throw new MongoServerError(res);
     if (res.writeErrors) throw new MongoServerError(res.writeErrors[0]);

package/src/operations/drop.ts

@@ -69,7 +69,7 @@ export class DropCollectionOperation extends CommandOperation<boolean> {
       }
     }
 
-    return this.executeWithoutEncryptedFieldsCheck(server, session);
+    return await this.executeWithoutEncryptedFieldsCheck(server, session);
   }
 
   private async executeWithoutEncryptedFieldsCheck(

package/src/operations/execute_operation.ts

@@ -1,4 +1,5 @@
 import type { Document } from '../bson';
+import { type CursorResponse } from '../cmap/wire_protocol/responses';
 import {
   isRetryableReadError,
   isRetryableWriteError,
@@ -26,7 +27,7 @@ import {
 } from '../sdam/server_selection';
 import type { Topology } from '../sdam/topology';
 import type { ClientSession } from '../sessions';
-import { supportsRetryableWrites } from '../utils';
+import { squashError, supportsRetryableWrites } from '../utils';
 import { AbstractOperation, Aspect } from './operation';
 
 const MMAPv1_RETRY_WRITES_ERROR_CODE = MONGODB_ERROR_CODES.IllegalOperation;
@@ -44,7 +45,7 @@ export interface ExecutionResult {
   /** The session used for this operation, may be implicitly created */
   session?: ClientSession;
   /** The raw server response for the operation */
-  response: Document;
+  response: Document | CursorResponse;
 }
 
 /**
@@ -110,11 +111,23 @@ export async function executeOperation<
   } else if (session.client !== client) {
     throw new MongoInvalidArgumentError('ClientSession must be from the same MongoClient');
   }
+  if (session.explicit && session?.timeoutMS != null && operation.options.timeoutMS != null) {
+    throw new MongoInvalidArgumentError(
+      'Do not specify timeoutMS on operation if already specified on an explicit session'
+    );
+  }
 
   const readPreference = operation.readPreference ?? ReadPreference.primary;
   const inTransaction = !!session?.inTransaction();
 
-  if (inTransaction && !readPreference.equals(ReadPreference.primary)) {
+  const hasReadAspect = operation.hasAspect(Aspect.READ_OPERATION);
+  const hasWriteAspect = operation.hasAspect(Aspect.WRITE_OPERATION);
+
+  if (
+    inTransaction &&
+    !readPreference.equals(ReadPreference.primary) &&
+    (hasReadAspect || operation.commandName === 'runCommand')
+  ) {
     throw new MongoTransactionError(
       `Read preference in a transaction must be primary, not: ${readPreference.mode}`
     );
@@ -139,14 +152,14 @@ export async function executeOperation<
     selector = readPreference;
   }
 
-  const server = await topology.selectServerAsync(selector, {
+  const server = await topology.selectServer(selector, {
     session,
     operationName: operation.commandName
   });
 
   if (session == null) {
     // No session also means it is not retryable, early exit
-    return operation.execute(server, undefined);
+    return await operation.execute(server, undefined);
   }
 
   if (!operation.hasAspect(Aspect.RETRYABLE)) {
@@ -155,7 +168,11 @@ export async function executeOperation<
       return await operation.execute(server, session);
     } finally {
       if (session?.owner != null && session.owner === owner) {
-        await session.endSession().catch(() => null);
+        try {
+          await session.endSession();
+        } catch (error) {
+          squashError(error);
+        }
       }
     }
   }
@@ -168,8 +185,6 @@ export async function executeOperation<
     supportsRetryableWrites(server) &&
     operation.canRetryWrite;
 
-  const hasReadAspect = operation.hasAspect(Aspect.READ_OPERATION);
-  const hasWriteAspect = operation.hasAspect(Aspect.WRITE_OPERATION);
   const willRetry = (hasReadAspect && willRetryRead) || (hasWriteAspect && willRetryWrite);
 
   if (hasWriteAspect && willRetryWrite) {
@@ -191,7 +206,11 @@ export async function executeOperation<
     throw operationError;
   } finally {
     if (session?.owner != null && session.owner === owner) {
-      await session.endSession().catch(() => null);
+      try {
+        await session.endSession();
+      } catch (error) {
+        squashError(error);
+      }
     }
   }
 }
@@ -244,7 +263,7 @@ async function retryOperation<
   }
 
   // select a new server, and attempt to retry the operation
-  const server = await topology.selectServerAsync(selector, {
+  const server = await topology.selectServer(selector, {
     session,
     operationName: operation.commandName,
     previousServer

package/src/operations/find.ts

@@ -1,5 +1,4 @@
 import type { Document } from '../bson';
-import type { Collection } from '../collection';
 import { MongoInvalidArgumentError } from '../error';
 import { ReadConcern } from '../read_concern';
 import type { Server } from '../sdam/server';
@@ -77,13 +76,8 @@ export class FindOperation extends CommandOperation<Document> {
   override options: FindOptions & { writeConcern?: never };
   filter: Document;
 
-  constructor(
-    collection: Collection | undefined,
-    ns: MongoDBNamespace,
-    filter: Document = {},
-    options: FindOptions = {}
-  ) {
-    super(collection, options);
+  constructor(ns: MongoDBNamespace, filter: Document = {}, options: FindOptions = {}) {
+    super(undefined, options);
 
     this.options = { ...options };
     delete this.options.writeConcern;
@@ -111,12 +105,17 @@ export class FindOperation extends CommandOperation<Document> {
       findCommand = decorateWithExplain(findCommand, this.explain);
     }
 
-    return server.command(this.ns, findCommand, {
-      ...this.options,
-      ...this.bsonOptions,
-      documentsReturnedIn: 'firstBatch',
-      session
-    });
+    return await server.command(
+      this.ns,
+      findCommand,
+      {
+        ...this.options,
+        ...this.bsonOptions,
+        documentsReturnedIn: 'firstBatch',
+        session
+      },
+      undefined
+    );
   }
 }
 

package/src/operations/get_more.ts

@@ -1,4 +1,5 @@
 import type { Document, Long } from '../bson';
+import { CursorResponse } from '../cmap/wire_protocol/responses';
 import { MongoRuntimeError } from '../error';
 import type { Server } from '../sdam/server';
 import type { ClientSession } from '../sessions';
@@ -19,6 +20,8 @@ export interface GetMoreOptions extends OperationOptions {
   maxTimeMS?: number;
   /** TODO(NODE-4413): Address bug with maxAwaitTimeMS not being passed in from the cursor correctly */
   maxAwaitTimeMS?: number;
+
+  useCursorResponse: boolean;
 }
 
 /**
@@ -96,7 +99,12 @@ export class GetMoreOperation extends AbstractOperation {
       ...this.options
     };
 
-    return server.command(this.ns, getMoreCmd, commandOptions);
+    return await server.command(
+      this.ns,
+      getMoreCmd,
+      commandOptions,
+      this.options.useCursorResponse ? CursorResponse : undefined
+    );
   }
 }