mongodb 6.5.0-dev.20240326.sha.918fe69 → 6.5.0-dev.20240403.sha.cb5903f

package/src/cursor/abstract_cursor.ts

@@ -20,7 +20,7 @@ import { ReadConcern, type ReadConcernLike } from '../read_concern';
 import { ReadPreference, type ReadPreferenceLike } from '../read_preference';
 import type { Server } from '../sdam/server';
 import { ClientSession, maybeClearPinnedConnection } from '../sessions';
-import { List, type MongoDBNamespace, ns } from '../utils';
+import { List, type MongoDBNamespace, ns, squashError } from '../utils';
 
 /** @internal */
 const kId = Symbol('id');
@@ -309,7 +309,11 @@ export abstract class AbstractCursor<
             const message =
               'Cursor returned a `null` document, but the cursor is not exhausted.  Mapping documents to `null` is not supported in the cursor transform.';
 
-            await cleanupCursor(this, { needsToEmitClosed: true }).catch(() => null);
+            try {
+              await cleanupCursor(this, { needsToEmitClosed: true });
+            } catch (error) {
+              squashError(error);
+            }
 
             throw new MongoAPIError(message);
           }
@@ -327,7 +331,11 @@ export abstract class AbstractCursor<
       // Only close the cursor if it has not already been closed. This finally clause handles
       // the case when a user would break out of a for await of loop early.
       if (!this.closed) {
-        await this.close().catch(() => null);
+        try {
+          await this.close();
+        } catch (error) {
+          squashError(error);
+        }
       }
     }
   }
@@ -387,7 +395,7 @@ export abstract class AbstractCursor<
       throw new MongoCursorExhaustedError();
     }
 
-    return next(this, { blocking: true, transform: true });
+    return await next(this, { blocking: true, transform: true });
   }
 
   /**
@@ -398,7 +406,7 @@ export abstract class AbstractCursor<
       throw new MongoCursorExhaustedError();
     }
 
-    return next(this, { blocking: false, transform: true });
+    return await next(this, { blocking: false, transform: true });
   }
 
   /**
@@ -605,7 +613,8 @@ export abstract class AbstractCursor<
       // We only want to end this session if we created it, and it hasn't ended yet
       if (session.explicit === false) {
         if (!session.hasEnded) {
-          session.endSession().catch(() => null);
+          // eslint-disable-next-line github/no-then
+          session.endSession().then(undefined, squashError);
         }
         this[kSession] = this.client.startSession({ owner: this, explicit: false });
       }
@@ -629,7 +638,7 @@ export abstract class AbstractCursor<
       batchSize
     });
 
-    return executeOperation(this[kClient], getMoreOperation);
+    return await executeOperation(this[kClient], getMoreOperation);
   }
 
   /**
@@ -724,9 +733,12 @@ async function next<T>(
         try {
           return cursor[kTransform](doc);
         } catch (error) {
-          // `cleanupCursorAsync` should never throw, but if it does we want to throw the original
-          // error instead.
-          await cleanupCursor(cursor, { error, needsToEmitClosed: true }).catch(() => null);
+          try {
+            await cleanupCursor(cursor, { error, needsToEmitClosed: true });
+          } catch (error) {
+            // `cleanupCursor` should never throw, squash and throw the original error
+            squashError(error);
+          }
           throw error;
         }
       }
@@ -736,7 +748,7 @@ async function next<T>(
 
     if (cursor.isDead) {
       // if the cursor is dead, we clean it up
-      // cleanupCursorAsync should never throw, but if it does it indicates a bug in the driver
+      // cleanupCursor should never throw, but if it does it indicates a bug in the driver
       // and we should surface the error
       await cleanupCursor(cursor, {});
       return null;
@@ -760,9 +772,12 @@ async function next<T>(
         cursor[kId] = cursorId;
       }
     } catch (error) {
-      // `cleanupCursorAsync` should never throw, but if it does we want to throw the original
-      // error instead.
-      await cleanupCursor(cursor, { error }).catch(() => null);
+      try {
+        await cleanupCursor(cursor, { error, needsToEmitClosed: true });
+      } catch (error) {
+        // `cleanupCursor` should never throw, squash and throw the original error
+        squashError(error);
+      }
       throw error;
     }
 
@@ -802,7 +817,7 @@ async function cleanupCursor(
 
   if (error) {
     if (cursor.loadBalanced && error instanceof MongoNetworkError) {
-      return completeCleanup();
+      return await completeCleanup();
     }
   }
 
@@ -850,14 +865,16 @@ async function cleanupCursor(
   cursor[kKilled] = true;
 
   if (session.hasEnded) {
-    return completeCleanup();
+    return await completeCleanup();
   }
 
   try {
     await executeOperation(
       cursor[kClient],
       new KillCursorsOperation(cursorId, cursorNs, server, { session })
-    ).catch(() => null);
+    );
+  } catch (error) {
+    squashError(error);
   } finally {
     await completeCleanup();
   }
@@ -892,6 +909,7 @@ class ReadableCursorStream extends Readable {
   }
 
   override _destroy(error: Error | null, callback: (error?: Error | null) => void): void {
+    // eslint-disable-next-line github/no-then
     this._cursor.close().then(
       () => callback(error),
       closeError => callback(closeError)
@@ -899,12 +917,14 @@ class ReadableCursorStream extends Readable {
   }
 
   private _readNext() {
+    // eslint-disable-next-line github/no-then
     next(this._cursor, { blocking: true, transform: true }).then(
       result => {
         if (result == null) {
           this.push(null);
         } else if (this.destroyed) {
-          this._cursor.close().catch(() => null);
+          // eslint-disable-next-line github/no-then
+          this._cursor.close().then(undefined, squashError);
         } else {
           if (this.push(result)) {
             return this._readNext();
@@ -919,7 +939,8 @@ class ReadableCursorStream extends Readable {
         //       a client during iteration. Alternatively, we could do the "right" thing and
         //       propagate the error message by removing this special case.
         if (err.message.match(/server is closed/)) {
-          this._cursor.close().catch(() => null);
+          // eslint-disable-next-line github/no-then
+          this._cursor.close().then(undefined, squashError);
           return this.push(null);
         }
 

package/src/cursor/aggregation_cursor.ts

@@ -76,7 +76,7 @@ export class AggregationCursor<TSchema = any> extends AbstractCursor<TSchema> {
 
   /** Execute the explain for the cursor */
   async explain(verbosity?: ExplainVerbosityLike): Promise<Document> {
-    return executeOperation(
+    return await executeOperation(
       this.client,
       new AggregateOperation(this.namespace, this[kPipeline], {
         ...this[kOptions], // NOTE: order matters here, we may need to refine this

package/src/cursor/find_cursor.ts

@@ -9,7 +9,7 @@ import { FindOperation, type FindOptions } from '../operations/find';
 import type { Hint } from '../operations/operation';
 import type { ClientSession } from '../sessions';
 import { formatSort, type Sort, type SortDirection } from '../sort';
-import { emitWarningOnce, mergeOptions, type MongoDBNamespace } from '../utils';
+import { emitWarningOnce, mergeOptions, type MongoDBNamespace, squashError } from '../utils';
 import { AbstractCursor, assertUninitialized } from './abstract_cursor';
 
 /** @internal */
@@ -94,15 +94,19 @@ export class FindCursor<TSchema = any> extends AbstractCursor<TSchema> {
         limit && limit > 0 && numReturned + batchSize > limit ? limit - numReturned : batchSize;
 
       if (batchSize <= 0) {
-        // this is an optimization for the special case of a limit for a find command to avoid an
-        // extra getMore when the limit has been reached and the limit is a multiple of the batchSize.
-        // This is a consequence of the new query engine in 5.0 having no knowledge of the limit as it
-        // produces results for the find command.  Once a batch is filled up, it is returned and only
-        // on the subsequent getMore will the query framework consider the limit, determine the cursor
-        // is exhausted and return a cursorId of zero.
-        // instead, if we determine there are no more documents to request from the server, we preemptively
-        // close the cursor
-        await this.close().catch(() => null);
+        try {
+          await this.close();
+        } catch (error) {
+          squashError(error);
+          // this is an optimization for the special case of a limit for a find command to avoid an
+          // extra getMore when the limit has been reached and the limit is a multiple of the batchSize.
+          // This is a consequence of the new query engine in 5.0 having no knowledge of the limit as it
+          // produces results for the find command.  Once a batch is filled up, it is returned and only
+          // on the subsequent getMore will the query framework consider the limit, determine the cursor
+          // is exhausted and return a cursorId of zero.
+          // instead, if we determine there are no more documents to request from the server, we preemptively
+          // close the cursor
+        }
         return { cursor: { id: Long.ZERO, nextBatch: [] } };
       }
     }
@@ -127,7 +131,7 @@ export class FindCursor<TSchema = any> extends AbstractCursor<TSchema> {
     if (typeof options === 'boolean') {
       throw new MongoInvalidArgumentError('Invalid first parameter to count');
     }
-    return executeOperation(
+    return await executeOperation(
       this.client,
       new CountOperation(this.namespace, this[kFilter], {
         ...this[kBuiltOptions], // NOTE: order matters here, we may need to refine this
@@ -139,7 +143,7 @@ export class FindCursor<TSchema = any> extends AbstractCursor<TSchema> {
 
   /** Execute the explain for the cursor */
   async explain(verbosity?: ExplainVerbosityLike): Promise<Document> {
-    return executeOperation(
+    return await executeOperation(
       this.client,
       new FindOperation(undefined, this.namespace, this[kFilter], {
         ...this[kBuiltOptions], // NOTE: order matters here, we may need to refine this

package/src/cursor/run_command_cursor.ts

@@ -128,6 +128,6 @@ export class RunCommandCursor extends AbstractCursor {
       ...this.getMoreOptions
     });
 
-    return executeOperation(this.client, getMoreOperation);
+    return await executeOperation(this.client, getMoreOperation);
   }
 }

package/src/db.ts

@@ -230,7 +230,7 @@ export class Db {
     name: string,
     options?: CreateCollectionOptions
   ): Promise<Collection<TSchema>> {
-    return executeOperation(
+    return await executeOperation(
       this.client,
       new CreateCollectionOperation(this, name, resolveOptions(this, options)) as TODO_NODE_3286
     );
@@ -263,7 +263,7 @@ export class Db {
    */
   async command(command: Document, options?: RunCommandOptions): Promise<Document> {
     // Intentionally, we do not inherit options from parent for this operation.
-    return executeOperation(
+    return await executeOperation(
       this.client,
       new RunCommandOperation(this, command, {
         ...resolveBSONOptions(options),
@@ -320,7 +320,10 @@ export class Db {
    * @param options - Optional settings for the command
    */
   async stats(options?: DbStatsOptions): Promise<Document> {
-    return executeOperation(this.client, new DbStatsOperation(this, resolveOptions(this, options)));
+    return await executeOperation(
+      this.client,
+      new DbStatsOperation(this, resolveOptions(this, options))
+    );
   }
 
   /**
@@ -366,7 +369,7 @@ export class Db {
     options?: RenameOptions
   ): Promise<Collection<TSchema>> {
     // Intentionally, we do not inherit options from parent for this operation.
-    return executeOperation(
+    return await executeOperation(
       this.client,
       new RenameOperation(
         this.collection<TSchema>(fromCollection) as TODO_NODE_3286,
@@ -383,7 +386,7 @@ export class Db {
    * @param options - Optional settings for the command
    */
   async dropCollection(name: string, options?: DropCollectionOptions): Promise<boolean> {
-    return executeOperation(
+    return await executeOperation(
       this.client,
       new DropCollectionOperation(this, name, resolveOptions(this, options))
     );
@@ -395,7 +398,7 @@ export class Db {
    * @param options - Optional settings for the command
    */
   async dropDatabase(options?: DropDatabaseOptions): Promise<boolean> {
-    return executeOperation(
+    return await executeOperation(
       this.client,
       new DropDatabaseOperation(this, resolveOptions(this, options))
     );
@@ -407,7 +410,7 @@ export class Db {
    * @param options - Optional settings for the command
    */
   async collections(options?: ListCollectionsOptions): Promise<Collection[]> {
-    return executeOperation(
+    return await executeOperation(
       this.client,
       new CollectionsOperation(this, resolveOptions(this, options))
     );
@@ -439,7 +442,7 @@ export class Db {
    * @param options - Optional settings for the command
    */
   async removeUser(username: string, options?: RemoveUserOptions): Promise<boolean> {
-    return executeOperation(
+    return await executeOperation(
       this.client,
       new RemoveUserOperation(this, username, resolveOptions(this, options))
     );
@@ -455,7 +458,7 @@ export class Db {
     level: ProfilingLevel,
     options?: SetProfilingLevelOptions
   ): Promise<ProfilingLevel> {
-    return executeOperation(
+    return await executeOperation(
       this.client,
       new SetProfilingLevelOperation(this, level, resolveOptions(this, options))
     );
@@ -467,7 +470,7 @@ export class Db {
    * @param options - Optional settings for the command
    */
   async profilingLevel(options?: ProfilingLevelOptions): Promise<string> {
-    return executeOperation(
+    return await executeOperation(
       this.client,
       new ProfilingLevelOperation(this, resolveOptions(this, options))
     );
@@ -480,7 +483,7 @@ export class Db {
    * @param options - Optional settings for the command
    */
   async indexInformation(name: string, options?: IndexInformationOptions): Promise<Document> {
-    return this.collection(name).indexInformation(resolveOptions(this, options));
+    return await this.collection(name).indexInformation(resolveOptions(this, options));
   }
 
   /**

package/src/encrypter.ts

@@ -108,13 +108,18 @@ export class Encrypter {
   }
 
   async close(client: MongoClient, force: boolean): Promise<void> {
-    const maybeError: Error | void = await this.autoEncrypter.teardown(!!force).catch(e => e);
+    let error;
+    try {
+      await this.autoEncrypter.teardown(force);
+    } catch (autoEncrypterError) {
+      error = autoEncrypterError;
+    }
     const internalClient = this[kInternalClient];
     if (internalClient != null && client !== internalClient) {
-      return internalClient.close(force);
+      return await internalClient.close(force);
     }
-    if (maybeError) {
-      throw maybeError;
+    if (error != null) {
+      throw error;
     }
   }
 

package/src/gridfs/download.ts

@@ -183,24 +183,13 @@ function doRead(stream: GridFSBucketReadStream): void {
   if (!stream.s.cursor) return;
   if (!stream.s.file) return;
 
-  const handleReadResult = ({
-    error,
-    doc
-  }: { error: Error; doc: null } | { error: null; doc: any }) => {
-    if (stream.destroyed) {
-      return;
-    }
-    if (error) {
-      stream.destroy(error);
-      return;
-    }
+  const handleReadResult = (doc: Document | null) => {
+    if (stream.destroyed) return;
+
     if (!doc) {
       stream.push(null);
-
-      stream.s.cursor?.close().then(
-        () => null,
-        error => stream.destroy(error)
-      );
+      // eslint-disable-next-line github/no-then
+      stream.s.cursor?.close().then(undefined, error => stream.destroy(error));
       return;
     }
 
@@ -271,10 +260,11 @@ function doRead(stream: GridFSBucketReadStream): void {
     return;
   };
 
-  stream.s.cursor.next().then(
-    doc => handleReadResult({ error: null, doc }),
-    error => handleReadResult({ error, doc: null })
-  );
+  // eslint-disable-next-line github/no-then
+  stream.s.cursor.next().then(handleReadResult, error => {
+    if (stream.destroyed) return;
+    stream.destroy(error);
+  });
 }
 
 function init(stream: GridFSBucketReadStream): void {
@@ -289,13 +279,8 @@ function init(stream: GridFSBucketReadStream): void {
     findOneOptions.skip = stream.s.options.skip;
   }
 
-  const handleReadResult = ({
-    error,
-    doc
-  }: { error: Error; doc: null } | { error: null; doc: any }) => {
-    if (error) {
-      return stream.destroy(error);
-    }
+  const handleReadResult = (doc: Document | null) => {
+    if (stream.destroyed) return;
 
     if (!doc) {
       const identifier = stream.s.filter._id
@@ -359,10 +344,11 @@ function init(stream: GridFSBucketReadStream): void {
     return;
   };
 
-  stream.s.files.findOne(stream.s.filter, findOneOptions).then(
-    doc => handleReadResult({ error: null, doc }),
-    error => handleReadResult({ error, doc: null })
-  );
+  // eslint-disable-next-line github/no-then
+  stream.s.files.findOne(stream.s.filter, findOneOptions).then(handleReadResult, error => {
+    if (stream.destroyed) return;
+    stream.destroy(error);
+  });
 }
 
 function waitForFile(stream: GridFSBucketReadStream, callback: Callback): void {

package/src/gridfs/upload.ts

@@ -4,7 +4,7 @@ import type { Document } from '../bson';
 import { ObjectId } from '../bson';
 import type { Collection } from '../collection';
 import { MongoAPIError, MONGODB_ERROR_CODES, MongoError } from '../error';
-import type { Callback } from '../utils';
+import { type Callback, squashError } from '../utils';
 import type { WriteConcernOptions } from '../write_concern';
 import { WriteConcern } from './../write_concern';
 import type { GridFSFile } from './download';
@@ -133,13 +133,11 @@ export class GridFSBucketWriteStream extends Writable {
     if (!this.bucket.s.calledOpenUploadStream) {
       this.bucket.s.calledOpenUploadStream = true;
 
-      checkIndexes(this).then(
-        () => {
-          this.bucket.s.checkedIndexes = true;
-          this.bucket.emit('index');
-        },
-        () => null
-      );
+      // eslint-disable-next-line github/no-then
+      checkIndexes(this).then(() => {
+        this.bucket.s.checkedIndexes = true;
+        this.bucket.emit('index');
+      }, squashError);
     }
   }
 
@@ -272,6 +270,7 @@ function checkDone(stream: GridFSBucketWriteStream, callback: Callback): void {
       return;
     }
 
+    // eslint-disable-next-line github/no-then
     stream.files.insertOne(gridFSFile, { writeConcern: stream.writeConcern }).then(
       () => {
         stream.gridFSFile = gridFSFile;
@@ -395,6 +394,7 @@ function doWrite(
         return;
       }
 
+      // eslint-disable-next-line github/no-then
       stream.chunks.insertOne(doc, { writeConcern: stream.writeConcern }).then(
         () => {
           --stream.state.outstandingRequests;
@@ -435,6 +435,7 @@ function writeRemnant(stream: GridFSBucketWriteStream, callback: Callback): void
     return;
   }
 
+  // eslint-disable-next-line github/no-then
   stream.chunks.insertOne(doc, { writeConcern: stream.writeConcern }).then(
     () => {
       --stream.state.outstandingRequests;

package/src/mongo_client.ts

@@ -49,7 +49,8 @@ import {
   isHostMatch,
   type MongoDBNamespace,
   ns,
-  resolveOptions
+  resolveOptions,
+  squashError
 } from './utils';
 import type { W, WriteConcern, WriteConcernSettings } from './write_concern';
 
@@ -468,7 +469,7 @@ export class MongoClient extends TypedEventEmitter<MongoClientEvents> {
    */
   async connect(): Promise<this> {
     if (this.connectionLock) {
-      return this.connectionLock;
+      return await this.connectionLock;
     }
 
     try {
@@ -599,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);
+        }
       }
     }
 
@@ -655,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();
   }
 
   /**
@@ -717,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);
       }
     }
   }

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/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/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(