mongodb 6.8.2 → 6.9.0-dev.20240917.sha.20396e1b

package/src/utils.ts

@@ -25,7 +25,7 @@ import {
   MongoParseError,
   MongoRuntimeError
 } from './error';
-import type { Explain } from './explain';
+import type { Explain, ExplainVerbosity } from './explain';
 import type { MongoClient } from './mongo_client';
 import type { CommandOperationOptions, OperationParent } from './operations/command';
 import type { Hint, OperationOptions } from './operations/operation';
@@ -192,7 +192,6 @@ export function isPromiseLike<T = unknown>(value?: unknown): value is PromiseLik
     value != null &&
     typeof value === 'object' &&
     'then' in value &&
-    // eslint-disable-next-line github/no-then
     typeof value.then === 'function'
   );
 }
@@ -252,12 +251,23 @@ export function decorateWithReadConcern(
  * @param command - the command on which to apply the explain
  * @param options - the options containing the explain verbosity
  */
-export function decorateWithExplain(command: Document, explain: Explain): Document {
-  if (command.explain) {
-    return command;
+export function decorateWithExplain(
+  command: Document,
+  explain: Explain
+): {
+  explain: Document;
+  verbosity: ExplainVerbosity;
+  maxTimeMS?: number;
+} {
+  type ExplainCommand = ReturnType<typeof decorateWithExplain>;
+  const { verbosity, maxTimeMS } = explain;
+  const baseCommand: ExplainCommand = { explain: command, verbosity };
+
+  if (typeof maxTimeMS === 'number') {
+    baseCommand.maxTimeMS = maxTimeMS;
   }
 
-  return { explain: command, verbosity: explain.verbosity };
+  return baseCommand;
 }
 
 /**
@@ -301,7 +311,10 @@ export class MongoDBNamespace {
    * @param db - database name
    * @param collection - collection name
    */
-  constructor(public db: string, public collection?: string) {
+  constructor(
+    public db: string,
+    public collection?: string
+  ) {
     this.collection = collection === '' ? undefined : collection;
   }
 
@@ -333,7 +346,10 @@ export class MongoDBNamespace {
  * used in scenarios where this can be guaranteed.
  */
 export class MongoDBCollectionNamespace extends MongoDBNamespace {
-  constructor(db: string, override collection: string) {
+  constructor(
+    db: string,
+    override collection: string
+  ) {
     super(db, collection);
   }
 
@@ -996,7 +1012,7 @@ export const DEFAULT_PK_FACTORY = {
  * })
  * ```
  */
-export const MONGODB_WARNING_CODE = 'MONGODB DRIVER' as const;
+export const MONGODB_WARNING_CODE = 'MONGODB DRIVER';
 
 /** @internal */
 export function emitWarning(message: string): void {

package/src/write_concern.ts

@@ -169,8 +169,8 @@ export function throwIfWriteConcernError(response: unknown): void {
       MongoDBResponse.is(response) && response.has('writeConcernError')
         ? response.toObject()
         : !MongoDBResponse.is(response) && 'writeConcernError' in response
-        ? response
-        : null;
+          ? response
+          : null;
 
     if (writeConcernError != null) {
       throw new MongoWriteConcernError(writeConcernError as any);

package/tsconfig.json

@@ -10,7 +10,8 @@
     "skipLibCheck": true,
     "lib": [
       "es2021",
-      "ES2022.Error"
+      "ES2022.Error",
+      "ES2022.Object"
     ],
     // We don't make use of tslib helpers, all syntax used is supported by target engine
     "importHelpers": false,

package/lib/cmap/auth/mongocr.js

@@ -1,35 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.MongoCR = void 0;
-const crypto = require("crypto");
-const error_1 = require("../../error");
-const utils_1 = require("../../utils");
-const auth_provider_1 = require("./auth_provider");
-class MongoCR extends auth_provider_1.AuthProvider {
-    async auth(authContext) {
-        const { connection, credentials } = authContext;
-        if (!credentials) {
-            throw new error_1.MongoMissingCredentialsError('AuthContext must provide credentials.');
-        }
-        const { username, password, source } = credentials;
-        const { nonce } = await connection.command((0, utils_1.ns)(`${source}.$cmd`), { getnonce: 1 }, undefined);
-        const hashPassword = crypto
-            .createHash('md5')
-            .update(`${username}:mongo:${password}`, 'utf8')
-            .digest('hex');
-        // Final key
-        const key = crypto
-            .createHash('md5')
-            .update(`${nonce}${username}${hashPassword}`, 'utf8')
-            .digest('hex');
-        const authenticateCommand = {
-            authenticate: 1,
-            user: username,
-            nonce,
-            key
-        };
-        await connection.command((0, utils_1.ns)(`${source}.$cmd`), authenticateCommand, undefined);
-    }
-}
-exports.MongoCR = MongoCR;
-//# sourceMappingURL=mongocr.js.map

package/lib/cmap/auth/mongocr.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"mongocr.js","sourceRoot":"","sources":["../../../src/cmap/auth/mongocr.ts"],"names":[],"mappings":";;;AAAA,iCAAiC;AAEjC,uCAA2D;AAC3D,uCAAiC;AACjC,mDAAiE;AAEjE,MAAa,OAAQ,SAAQ,4BAAY;IAC9B,KAAK,CAAC,IAAI,CAAC,WAAwB;QAC1C,MAAM,EAAE,UAAU,EAAE,WAAW,EAAE,GAAG,WAAW,CAAC;QAChD,IAAI,CAAC,WAAW,EAAE;YAChB,MAAM,IAAI,oCAA4B,CAAC,uCAAuC,CAAC,CAAC;SACjF;QAED,MAAM,EAAE,QAAQ,EAAE,QAAQ,EAAE,MAAM,EAAE,GAAG,WAAW,CAAC;QAEnD,MAAM,EAAE,KAAK,EAAE,GAAG,MAAM,UAAU,CAAC,OAAO,CAAC,IAAA,UAAE,EAAC,GAAG,MAAM,OAAO,CAAC,EAAE,EAAE,QAAQ,EAAE,CAAC,EAAE,EAAE,SAAS,CAAC,CAAC;QAE7F,MAAM,YAAY,GAAG,MAAM;aACxB,UAAU,CAAC,KAAK,CAAC;aACjB,MAAM,CAAC,GAAG,QAAQ,UAAU,QAAQ,EAAE,EAAE,MAAM,CAAC;aAC/C,MAAM,CAAC,KAAK,CAAC,CAAC;QAEjB,YAAY;QACZ,MAAM,GAAG,GAAG,MAAM;aACf,UAAU,CAAC,KAAK,CAAC;aACjB,MAAM,CAAC,GAAG,KAAK,GAAG,QAAQ,GAAG,YAAY,EAAE,EAAE,MAAM,CAAC;aACpD,MAAM,CAAC,KAAK,CAAC,CAAC;QAEjB,MAAM,mBAAmB,GAAG;YAC1B,YAAY,EAAE,CAAC;YACf,IAAI,EAAE,QAAQ;YACd,KAAK;YACL,GAAG;SACJ,CAAC;QAEF,MAAM,UAAU,CAAC,OAAO,CAAC,IAAA,UAAE,EAAC,GAAG,MAAM,OAAO,CAAC,EAAE,mBAAmB,EAAE,SAAS,CAAC,CAAC;IACjF,CAAC;CACF;AA/BD,0BA+BC"}

package/src/cmap/auth/mongocr.ts

@@ -1,38 +0,0 @@
-import * as crypto from 'crypto';
-
-import { MongoMissingCredentialsError } from '../../error';
-import { ns } from '../../utils';
-import { type AuthContext, AuthProvider } from './auth_provider';
-
-export class MongoCR extends AuthProvider {
-  override async auth(authContext: AuthContext): Promise<void> {
-    const { connection, credentials } = authContext;
-    if (!credentials) {
-      throw new MongoMissingCredentialsError('AuthContext must provide credentials.');
-    }
-
-    const { username, password, source } = credentials;
-
-    const { nonce } = await connection.command(ns(`${source}.$cmd`), { getnonce: 1 }, undefined);
-
-    const hashPassword = crypto
-      .createHash('md5')
-      .update(`${username}:mongo:${password}`, 'utf8')
-      .digest('hex');
-
-    // Final key
-    const key = crypto
-      .createHash('md5')
-      .update(`${nonce}${username}${hashPassword}`, 'utf8')
-      .digest('hex');
-
-    const authenticateCommand = {
-      authenticate: 1,
-      user: username,
-      nonce,
-      key
-    };
-
-    await connection.command(ns(`${source}.$cmd`), authenticateCommand, undefined);
-  }
-}