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

package/src/bson.ts

@@ -1,8 +1,10 @@
 import type { DeserializeOptions, SerializeOptions } from 'bson';
+import { BSON } from 'bson';
 
 export {
   Binary,
   BSON,
+  BSONError,
   BSONRegExp,
   BSONSymbol,
   BSONType,
@@ -25,6 +27,17 @@ export {
   UUID
 } from 'bson';
 
+export type BSONElement = BSON.OnDemand['BSONElement'];
+
+export function parseToElementsToArray(bytes: Uint8Array, offset?: number): BSONElement[] {
+  const res = BSON.onDemand.parseToElements(bytes, offset);
+  return Array.isArray(res) ? res : [...res];
+}
+export const getInt32LE = BSON.onDemand.NumberUtils.getInt32LE;
+export const getFloat64LE = BSON.onDemand.NumberUtils.getFloat64LE;
+export const getBigInt64LE = BSON.onDemand.NumberUtils.getBigInt64LE;
+export const toUTF8 = BSON.onDemand.ByteUtils.toUTF8;
+
 /**
  * BSON Serialization options.
  * @public

package/src/bulk/common.ts

@@ -589,6 +589,7 @@ function executeCommands(
       : null;
 
     if (operation != null) {
+      // eslint-disable-next-line github/no-then
       executeOperation(bulkOperation.s.collection.client, operation).then(
         result => resultHandler(undefined, result),
         error => resultHandler(error)
@@ -1224,7 +1225,7 @@ export abstract class BulkOperationBase {
     const finalOptions = { ...this.s.options, ...options };
     const operation = new BulkWriteShimOperation(this, finalOptions);
 
-    return executeOperation(this.s.collection.client, operation);
+    return await executeOperation(this.s.collection.client, operation);
   }
 
   /**

package/src/change_stream.ts

@@ -19,7 +19,7 @@ import type { AggregateOptions } from './operations/aggregate';
 import type { CollationOptions, OperationParent } from './operations/command';
 import type { ReadPreference } from './read_preference';
 import type { ServerSessionId } from './sessions';
-import { filterOptions, getTopology, type MongoDBNamespace } from './utils';
+import { filterOptions, getTopology, type MongoDBNamespace, squashError } from './utils';
 
 /** @internal */
 const kCursorStream = Symbol('cursorStream');
@@ -379,7 +379,7 @@ export interface ChangeStreamInvalidateDocument extends ChangeStreamDocumentComm
 /**
  * Only present when the `showExpandedEvents` flag is enabled.
  * @public
- * @see https://www.mongodb.com/docs/manual/reference/change-events/
+ * @see https://www.mongodb.com/docs/manual/reference/change-events/createIndexes/#mongodb-data-createIndexes
  */
 export interface ChangeStreamCreateIndexDocument
   extends ChangeStreamDocumentCommon,
@@ -392,7 +392,7 @@ export interface ChangeStreamCreateIndexDocument
 /**
  * Only present when the `showExpandedEvents` flag is enabled.
  * @public
- * @see https://www.mongodb.com/docs/manual/reference/change-events/
+ * @see https://www.mongodb.com/docs/manual/reference/change-events/dropIndexes/#mongodb-data-dropIndexes
  */
 export interface ChangeStreamDropIndexDocument
   extends ChangeStreamDocumentCommon,
@@ -405,7 +405,7 @@ export interface ChangeStreamDropIndexDocument
 /**
  * Only present when the `showExpandedEvents` flag is enabled.
  * @public
- * @see https://www.mongodb.com/docs/manual/reference/change-events/
+ * @see https://www.mongodb.com/docs/manual/reference/change-events/modify/#mongodb-data-modify
  */
 export interface ChangeStreamCollModDocument
   extends ChangeStreamDocumentCommon,
@@ -416,7 +416,7 @@ export interface ChangeStreamCollModDocument
 
 /**
  * @public
- * @see https://www.mongodb.com/docs/manual/reference/change-events/
+ * @see https://www.mongodb.com/docs/manual/reference/change-events/create/#mongodb-data-create
  */
 export interface ChangeStreamCreateDocument
   extends ChangeStreamDocumentCommon,
@@ -427,7 +427,7 @@ export interface ChangeStreamCreateDocument
 
 /**
  * @public
- * @see https://www.mongodb.com/docs/manual/reference/change-events/
+ * @see https://www.mongodb.com/docs/manual/reference/change-events/shardCollection/#mongodb-data-shardCollection
  */
 export interface ChangeStreamShardCollectionDocument
   extends ChangeStreamDocumentCommon,
@@ -439,7 +439,7 @@ export interface ChangeStreamShardCollectionDocument
 
 /**
  * @public
- * @see https://www.mongodb.com/docs/manual/reference/change-events/
+ * @see https://www.mongodb.com/docs/manual/reference/change-events/reshardCollection/#mongodb-data-reshardCollection
  */
 export interface ChangeStreamReshardCollectionDocument
   extends ChangeStreamDocumentCommon,
@@ -451,7 +451,7 @@ export interface ChangeStreamReshardCollectionDocument
 
 /**
  * @public
- * @see https://www.mongodb.com/docs/manual/reference/change-events/
+ * @see https://www.mongodb.com/docs/manual/reference/change-events/refineCollectionShardKey/#mongodb-data-refineCollectionShardKey
  */
 export interface ChangeStreamRefineCollectionShardKeyDocument
   extends ChangeStreamDocumentCommon,
@@ -676,8 +676,8 @@ export class ChangeStream<
         } catch (error) {
           try {
             await this.close();
-          } catch {
-            // We are not concerned with errors from close()
+          } catch (error) {
+            squashError(error);
           }
           throw error;
         }
@@ -703,8 +703,8 @@ export class ChangeStream<
         } catch (error) {
           try {
             await this.close();
-          } catch {
-            // We are not concerned with errors from close()
+          } catch (error) {
+            squashError(error);
           }
           throw error;
         }
@@ -731,8 +731,8 @@ export class ChangeStream<
         } catch (error) {
           try {
             await this.close();
-          } catch {
-            // We are not concerned with errors from close()
+          } catch (error) {
+            squashError(error);
           }
           throw error;
         }
@@ -754,8 +754,8 @@ export class ChangeStream<
     } finally {
       try {
         await this.close();
-      } catch {
-        // we're not concerned with errors from close()
+      } catch (error) {
+        squashError(error);
       }
     }
   }
@@ -867,7 +867,8 @@ export class ChangeStream<
   private _closeEmitterModeWithError(error: AnyError): void {
     this.emit(ChangeStream.ERROR, error);
 
-    this.close().catch(() => null);
+    // eslint-disable-next-line github/no-then
+    this.close().then(undefined, squashError);
   }
 
   /** @internal */
@@ -931,13 +932,15 @@ export class ChangeStream<
 
     if (isResumableError(changeStreamError, this.cursor.maxWireVersion)) {
       this._endStream();
-      this.cursor.close().catch(() => null);
+      // eslint-disable-next-line github/no-then
+      this.cursor.close().then(undefined, squashError);
 
       const topology = getTopology(this.parent);
       topology
         .selectServer(this.cursor.readPreference, {
           operationName: 'reconnect topology in change stream'
         })
+        // eslint-disable-next-line github/no-then
         .then(
           () => {
             this.cursor = this._createChangeStreamCursor(this.cursor.resumeOptions);
@@ -959,13 +962,17 @@ export class ChangeStream<
     if (!isResumableError(changeStreamError, this.cursor.maxWireVersion)) {
       try {
         await this.close();
-      } catch {
-        // ignore errors from close
+      } catch (error) {
+        squashError(error);
       }
       throw changeStreamError;
     }
 
-    await this.cursor.close().catch(() => null);
+    try {
+      await this.cursor.close();
+    } catch (error) {
+      squashError(error);
+    }
     const topology = getTopology(this.parent);
     try {
       await topology.selectServer(this.cursor.readPreference, {

package/src/client-side-encryption/auto_encrypter.ts

@@ -467,7 +467,7 @@ export class AutoEncrypter {
       proxyOptions: this._proxyOptions,
       tlsOptions: this._tlsOptions
     });
-    return stateMachine.execute<Document>(this, context);
+    return await stateMachine.execute<Document>(this, context);
   }
 
   /**
@@ -502,7 +502,7 @@ export class AutoEncrypter {
    * the original ones.
    */
   async askForKMSCredentials(): Promise<KMSProviders> {
-    return refreshKMSCredentials(this._kmsProviders);
+    return await refreshKMSCredentials(this._kmsProviders);
   }
 
   /**

package/src/client-side-encryption/client_encryption.ts

@@ -315,7 +315,7 @@ export class ClientEncryption {
       this._keyVaultNamespace
     );
 
-    return this._keyVaultClient
+    return await this._keyVaultClient
       .db(dbName)
       .collection<DataKey>(collectionName)
       .deleteOne({ _id }, { writeConcern: { w: 'majority' } });
@@ -364,7 +364,7 @@ export class ClientEncryption {
       this._keyVaultNamespace
     );
 
-    return this._keyVaultClient
+    return await this._keyVaultClient
       .db(dbName)
       .collection<DataKey>(collectionName)
       .findOne({ _id }, { readConcern: { level: 'majority' } });
@@ -391,7 +391,7 @@ export class ClientEncryption {
       this._keyVaultNamespace
     );
 
-    return this._keyVaultClient
+    return await this._keyVaultClient
       .db(dbName)
       .collection<DataKey>(collectionName)
       .findOne({ keyAltNames: keyAltName }, { readConcern: { level: 'majority' } });
@@ -589,7 +589,7 @@ export class ClientEncryption {
    * ```
    */
   async encrypt(value: unknown, options: ClientEncryptionEncryptOptions): Promise<Binary> {
-    return this._encrypt(value, false, options);
+    return await this._encrypt(value, false, options);
   }
 
   /**
@@ -614,7 +614,7 @@ export class ClientEncryption {
     expression: Document,
     options: ClientEncryptionEncryptOptions
   ): Promise<Binary> {
-    return this._encrypt(expression, true, options);
+    return await this._encrypt(expression, true, options);
   }
 
   /**
@@ -654,7 +654,7 @@ export class ClientEncryption {
    * the original ones.
    */
   async askForKMSCredentials(): Promise<KMSProviders> {
-    return refreshKMSCredentials(this._kmsProviders);
+    return await refreshKMSCredentials(this._kmsProviders);
   }
 
   static get libmongocryptVersion() {

package/src/client-side-encryption/providers/azure.ts

@@ -148,13 +148,15 @@ export async function fetchAzureKMSToken(
   options: AzureKMSRequestOptions = {}
 ): Promise<AzureTokenCacheEntry> {
   const { headers, url } = prepareRequest(options);
-  const response = await get(url, { headers }).catch(error => {
+  try {
+    const response = await get(url, { headers });
+    return await parseResponse(response);
+  } catch (error) {
     if (error instanceof MongoCryptKMSRequestNetworkTimeoutError) {
       throw new MongoCryptAzureKMSRequestError(`[Azure KMS] ${error.message}`);
     }
     throw error;
-  });
-  return parseResponse(response);
+  }
 }
 
 /**

package/src/cmap/auth/aws_temporary_credentials.ts

@@ -139,7 +139,9 @@ export class LegacyAWSTemporaryCredentialProvider extends AWSTemporaryCredential
     // If the environment variable AWS_CONTAINER_CREDENTIALS_RELATIVE_URI
     // is set then drivers MUST assume that it was set by an AWS ECS agent
     if (process.env.AWS_CONTAINER_CREDENTIALS_RELATIVE_URI) {
-      return request(`${AWS_RELATIVE_URI}${process.env.AWS_CONTAINER_CREDENTIALS_RELATIVE_URI}`);
+      return await request(
+        `${AWS_RELATIVE_URI}${process.env.AWS_CONTAINER_CREDENTIALS_RELATIVE_URI}`
+      );
     }
 
     // Otherwise assume we are on an EC2 instance

package/src/cmap/auth/gssapi.ts

@@ -30,10 +30,10 @@ async function externalCommand(
   connection: Connection,
   command: ReturnType<typeof saslStart> | ReturnType<typeof saslContinue>
 ): Promise<{ payload: string; conversationId: any }> {
-  return connection.command(ns('$external.$cmd'), command, undefined) as Promise<{
+  return await (connection.command(ns('$external.$cmd'), command, undefined) as Promise<{
     payload: string;
     conversationId: any;
-  }>;
+  }>);
 }
 
 let krb: typeof Kerberos;
@@ -104,7 +104,7 @@ async function makeKerberosClient(authContext: AuthContext): Promise<KerberosCli
     spn = `${spn}@${mechanismProperties.SERVICE_REALM}`;
   }
 
-  return initializeClient(spn, initOptions);
+  return await initializeClient(spn, initOptions);
 }
 
 function saslStart(payload: string) {
@@ -138,14 +138,14 @@ async function negotiate(
       throw error;
     }
     // Adjust number of retries and call step again
-    return negotiate(client, retries - 1, payload);
+    return await negotiate(client, retries - 1, payload);
   }
 }
 
 async function finalize(client: KerberosClient, user: string, payload: string): Promise<string> {
   // GSS Client Unwrap
   const response = await client.unwrap(payload);
-  return client.wrap(response || '', { user });
+  return await client.wrap(response || '', { user });
 }
 
 export async function performGSSAPICanonicalizeHostName(
@@ -174,12 +174,12 @@ export async function performGSSAPICanonicalizeHostName(
       // This can error as ptr records may not exist for all ips. In this case
       // fallback to a cname lookup as dns.lookup() does not return the
       // cname.
-      return resolveCname(host);
+      return await resolveCname(host);
     }
   } else {
     // The case for forward is just to resolve the cname as dns.lookup()
     // will not return it.
-    return resolveCname(host);
+    return await resolveCname(host);
   }
 }
 

package/src/cmap/auth/mongodb_oidc/aws_service_workflow.ts

@@ -24,6 +24,6 @@ export class AwsServiceWorkflow extends ServiceWorkflow {
     if (!tokenFile) {
       throw new MongoAWSError(TOKEN_MISSING_ERROR);
     }
-    return fs.promises.readFile(tokenFile, 'utf8');
+    return await fs.promises.readFile(tokenFile, 'utf8');
   }
 }

package/src/cmap/auth/mongodb_oidc/callback_lock_cache.ts

@@ -87,8 +87,9 @@ function withLock(callback: OIDCRequestFunction | OIDCRefreshFunction) {
   let lock: Promise<any> = Promise.resolve();
   return async (info: IdPServerInfo, context: OIDCCallbackContext): Promise<IdPServerResponse> => {
     await lock;
+    // eslint-disable-next-line github/no-then
     lock = lock.then(() => callback(info, context));
-    return lock;
+    return await lock;
   };
 }
 

package/src/cmap/auth/mongodb_oidc/service_workflow.ts

@@ -18,7 +18,7 @@ export abstract class ServiceWorkflow implements Workflow {
   async execute(connection: Connection, credentials: MongoCredentials): Promise<Document> {
     const token = await this.getToken(credentials);
     const command = commandDocument(token);
-    return connection.command(ns(credentials.source), command, undefined);
+    return await connection.command(ns(credentials.source), command, undefined);
   }
 
   /**

package/src/cmap/auth/scram.ts

@@ -51,13 +51,13 @@ class ScramSHA extends AuthProvider {
   override async auth(authContext: AuthContext) {
     const { reauthenticating, response } = authContext;
     if (response?.speculativeAuthenticate && !reauthenticating) {
-      return continueScramConversation(
+      return await continueScramConversation(
         this.cryptoMethod,
         response.speculativeAuthenticate,
         authContext
       );
     }
-    return executeScram(this.cryptoMethod, authContext);
+    return await executeScram(this.cryptoMethod, authContext);
   }
 }
 

package/src/cmap/connect.ts

@@ -226,13 +226,13 @@ export async function prepareHandshakeDocument(
           `No AuthProvider for ${AuthMechanism.MONGODB_SCRAM_SHA256} defined.`
         );
       }
-      return provider.prepare(handshakeDoc, authContext);
+      return await provider.prepare(handshakeDoc, authContext);
     }
     const provider = authContext.options.authProviders.getOrCreateProvider(credentials.mechanism);
     if (!provider) {
       throw new MongoInvalidArgumentError(`No AuthProvider for ${credentials.mechanism} defined.`);
     }
-    return provider.prepare(handshakeDoc, authContext);
+    return await provider.prepare(handshakeDoc, authContext);
   }
   return handshakeDoc;
 }
@@ -325,7 +325,7 @@ export async function makeSocket(options: MakeConnectionOptions): Promise<Stream
 
   if (options.proxyHost != null) {
     // Currently, only Socks5 is supported.
-    return makeSocks5Connection({
+    return await makeSocks5Connection({
       ...options,
       connectTimeoutMS // Should always be present for Socks5
     });

package/src/cmap/connection.ts

@@ -38,6 +38,7 @@ import {
   type MongoDBNamespace,
   now,
   once,
+  squashError,
   uuidV4
 } from '../utils';
 import type { WriteConcern } from '../write_concern';
@@ -324,7 +325,8 @@ export class Connection extends TypedEventEmitter<ConnectionEvents> {
 
     this.socket.destroy();
     this.error = error;
-    this.dataEvents?.throw(error).then(undefined, () => null); // squash unhandled rejection
+    // eslint-disable-next-line github/no-then
+    this.dataEvents?.throw(error).then(undefined, squashError);
     this.closed = true;
     this.emit(Connection.CLOSE);
   }
@@ -579,7 +581,8 @@ export class Connection extends TypedEventEmitter<ConnectionEvents> {
       }
       throw new MongoUnexpectedServerResponseError('Server ended moreToCome unexpectedly');
     };
-    exhaustLoop().catch(replyListener);
+    // eslint-disable-next-line github/no-then
+    exhaustLoop().then(undefined, replyListener);
   }
 
   private throwIfAborted() {
@@ -607,7 +610,7 @@ export class Connection extends TypedEventEmitter<ConnectionEvents> {
     const buffer = Buffer.concat(await finalCommand.toBin());
 
     if (this.socket.write(buffer)) return;
-    return once(this.socket, 'drain');
+    return await once(this.socket, 'drain');
   }
 
   /**
@@ -698,7 +701,7 @@ export class CryptoConnection extends Connection {
     const serverWireVersion = maxWireVersion(this);
     if (serverWireVersion === 0) {
       // This means the initial handshake hasn't happened yet
-      return super.command(ns, cmd, options);
+      return await super.command(ns, cmd, options);
     }
 
     if (serverWireVersion < 8) {
@@ -734,6 +737,6 @@ export class CryptoConnection extends Connection {
 
     const response = await super.command(ns, encrypted, options);
 
-    return autoEncrypter.decrypt(response, options);
+    return await autoEncrypter.decrypt(response, options);
   }
 }

package/src/cmap/connection_pool.ts

@@ -394,7 +394,7 @@ export class ConnectionPool extends TypedEventEmitter<ConnectionPoolEvents> {
     this[kWaitQueue].push(waitQueueMember);
     process.nextTick(() => this.processWaitQueue());
 
-    return promise;
+    return await promise;
   }
 
   /**
@@ -631,6 +631,7 @@ export class ConnectionPool extends TypedEventEmitter<ConnectionPoolEvents> {
       new ConnectionCreatedEvent(this, { id: connectOptions.id })
     );
 
+    // eslint-disable-next-line github/no-then
     connect(connectOptions).then(
       connection => {
         // The pool might have closed since we started trying to create a connection

package/src/cmap/handshake/client_metadata.ts

@@ -1,10 +1,10 @@
-import { promises as fs } from 'fs';
 import * as os from 'os';
 import * as process from 'process';
 
 import { BSON, type Document, Int32 } from '../../bson';
 import { MongoInvalidArgumentError } from '../../error';
 import type { MongoOptions } from '../../mongo_client';
+import { fileIsAccessible } from '../../utils';
 
 // eslint-disable-next-line @typescript-eslint/no-var-requires
 const NODE_DRIVER_VERSION = require('../../../package.json').version;
@@ -160,10 +160,7 @@ let dockerPromise: Promise<boolean>;
 /** @internal */
 async function getContainerMetadata() {
   const containerMetadata: Record<string, any> = {};
-  dockerPromise ??= fs.access('/.dockerenv').then(
-    () => true,
-    () => false
-  );
+  dockerPromise ??= fileIsAccessible('/.dockerenv');
   const isDocker = await dockerPromise;
 
   const { KUBERNETES_SERVICE_HOST = '' } = process.env;

package/src/cmap/wire_protocol/compression.ts

@@ -67,20 +67,20 @@ export async function compress(
   switch (options.agreedCompressor) {
     case 'snappy': {
       Snappy ??= loadSnappy();
-      return Snappy.compress(dataToBeCompressed);
+      return await Snappy.compress(dataToBeCompressed);
     }
     case 'zstd': {
       loadZstd();
       if ('kModuleError' in zstd) {
         throw zstd['kModuleError'];
       }
-      return zstd.compress(dataToBeCompressed, ZSTD_COMPRESSION_LEVEL);
+      return await zstd.compress(dataToBeCompressed, ZSTD_COMPRESSION_LEVEL);
     }
     case 'zlib': {
       if (options.zlibCompressionLevel) {
         zlibOptions.level = options.zlibCompressionLevel;
       }
-      return zlibDeflate(dataToBeCompressed, zlibOptions);
+      return await zlibDeflate(dataToBeCompressed, zlibOptions);
     }
     default: {
       throw new MongoInvalidArgumentError(
@@ -106,17 +106,17 @@ export async function decompress(compressorID: number, compressedData: Buffer):
   switch (compressorID) {
     case Compressor.snappy: {
       Snappy ??= loadSnappy();
-      return Snappy.uncompress(compressedData, { asBuffer: true });
+      return await Snappy.uncompress(compressedData, { asBuffer: true });
     }
     case Compressor.zstd: {
       loadZstd();
       if ('kModuleError' in zstd) {
         throw zstd['kModuleError'];
       }
-      return zstd.decompress(compressedData);
+      return await zstd.decompress(compressedData);
     }
     case Compressor.zlib: {
-      return zlibInflate(compressedData);
+      return await zlibInflate(compressedData);
     }
     default: {
       return compressedData;