Remove unused or alias options

src/cmap/auth/mongo_credentials.ts

@@ -1,6 +1,7 @@
 // Resolves the default auth mechanism according to
 
 import type { Document } from '../../bson';
+import { MongoParseError } from '../../error';
 import { AuthMechanism, AuthMechanismEnum } from './defaultAuthProviders';
 
 // https://github.com/mongodb/specifications/blob/master/source/auth/auth.rst
@@ -108,4 +109,37 @@ export class MongoCredentials {
 
     return this;
   }
+
+  validate(): void {
+    if (
+      (this.mechanism === 'GSSAPI' ||
+        this.mechanism === 'MONGODB-CR' ||
+        this.mechanism === 'PLAIN' ||
+        this.mechanism === 'SCRAM-SHA-1' ||
+        this.mechanism === 'SCRAM-SHA-256') &&
+      !this.username
+    ) {
+      throw new MongoParseError(`Username required for mechanism '${this.mechanism}'`);
+    }
+
+    if (
+      this.mechanism === 'GSSAPI' ||
+      this.mechanism === 'MONGODB-AWS' ||
+      this.mechanism === 'MONGODB-X509'
+    ) {
+      if (this.source != null && this.source !== '$external') {
+        throw new MongoParseError(
+          `Invalid source '${this.source}' for mechanism '${this.mechanism}' specified.`
+        );
+      }
+    }
+
+    if (this.mechanism === 'PLAIN' && this.source == null) {
+      throw new MongoParseError('PLAIN Authentication Mechanism needs an auth source');
+    }
+
+    if (this.mechanism === 'MONGODB-X509' && this.password != null) {
+      throw new MongoParseError(`Password not allowed for mechanism MONGODB-X509`);
+    }
+  }
 }

src/connection_string.ts

@@ -529,9 +529,13 @@ function assertRepelOptions(options: AnyOptions, optionKeyA: string, optionKeyB:
  * @param options - The options used for options parsing
  * @throws MongoParseError if TLS options are invalid
  */
-function checkTLSOptions(options: AnyOptions) {
-  if (!options) return null;
-  const check = (a: any, b: any) => assertRepelOptions(options, a, b);
+export function checkTLSOptions(options: AnyOptions): void {
+  if (!options) return;
+  const check = (a: string, b: string) => {
+    if (Reflect.has(options, a) && Reflect.has(options, b)) {
+      throw new MongoParseError(`The '${a}' option cannot be used with '${b}'`);
+    }
+  };
   check('tlsInsecure', 'tlsAllowInvalidCertificates');
   check('tlsInsecure', 'tlsAllowInvalidHostnames');
   check('tlsInsecure', 'tlsDisableCertificateRevocationCheck');

src/db.ts

@@ -71,7 +71,6 @@ const legalOptionNames = [
   'pkFactory',
   'serializeFunctions',
   'raw',
-  'bufferMaxEntries',
   'authSource',
   'ignoreUndefined',
   'promoteLongs',

src/mongo_client.ts

@@ -127,6 +127,8 @@ export interface MongoURIOptions extends Pick<WriteConcernOptions, 'journal' | '
   serverSelectionTryOnce?: boolean;
   /** heartbeatFrequencyMS controls when the driver checks the state of the MongoDB deployment. Specify the interval (in milliseconds) between checks, counted from the end of the previous check until the beginning of the next one. */
   heartbeatFrequencyMS?: number;
+  /** Sets the minimum heartbeat frequency. In the event that the driver has to frequently re-check a server's availability, it will wait at least this long since the previous check to avoid wasted effort. */
+  minHeartbeatFrequencyMS?: number;
   /** The name of the application that created this MongoClient instance. MongoDB 3.4 and newer will print this value in the server log upon establishing each connection. It is also recorded in the slow query log and profile collections */
   appName?: string;
   /** Enables retryable reads. */
@@ -142,8 +144,6 @@ export interface MongoClientOptions
   extends WriteConcernOptions,
     MongoURIOptions,
     BSONSerializeOptions {
-  /** The maximum number of connections in the connection pool. */
-  poolSize?: MongoURIOptions['maxPoolSize'];
   /** Validate mongod server certificate against Certificate Authority */
   sslValidate?: boolean;
   /** SSL Certificate store binary buffer. */
@@ -192,8 +192,6 @@ export interface MongoClientOptions
   numberOfRetries?: number;
   /** Enable command monitoring for this client */
   monitorCommands?: boolean;
-  /** If present, the connection pool will be initialized with minSize connections, and will never dip below minSize connections */
-  minSize?: number;
   /** Optionally enable client side auto encryption */
   autoEncryption?: AutoEncryptionOptions;
   /** Allows a wrapping driver to amend the client metadata generated by the driver to include information about the wrapping driver */
@@ -202,6 +200,8 @@ export interface MongoClientOptions
   servername?: string;
 
   dbName?: string;
+  username?: string;
+  password?: string;
 }
 
 /** @public */

src/operations/connect.ts

@@ -58,7 +58,6 @@ const validOptionNames = [
   'serializeFunctions',
   'ignoreUndefined',
   'raw',
-  'bufferMaxEntries',
   'readPreference',
   'pkFactory',
   'promiseLibrary',
@@ -88,7 +87,6 @@ const validOptionNames = [
   'retryReads',
   'useNewUrlParser',
   'serverSelectionTimeoutMS',
-  'useRecoveryToken',
   'autoEncryption',
   'driverInfo',
   'tls',
@@ -219,7 +217,6 @@ export function connect(
     if (finalOptions.socketTimeoutMS == null) finalOptions.socketTimeoutMS = 0;
     if (finalOptions.connectTimeoutMS == null) finalOptions.connectTimeoutMS = 10000;
     if (finalOptions.retryWrites == null) finalOptions.retryWrites = true;
-    if (finalOptions.useRecoveryToken == null) finalOptions.useRecoveryToken = true;
     if (finalOptions.readPreference == null) finalOptions.readPreference = 'primary';
 
     if (finalOptions.db_options && finalOptions.db_options.auth) {

src/sdam/common.ts

@@ -40,10 +40,7 @@ export const TOPOLOGY_DEFAULTS = {
   localThresholdMS: 15,
   serverSelectionTimeoutMS: 30000,
   heartbeatFrequencyMS: 10000,
-  minHeartbeatFrequencyMS: 500,
-
-  // TODO: remove in v4
-  useRecoveryToken: true
+  minHeartbeatFrequencyMS: 500
 };
 
 /** @internal */

src/sdam/topology.ts

@@ -162,7 +162,6 @@ export interface TopologyOptions extends ServerOptions, BSONSerializeOptions, Lo
   directConnection: boolean;
 
   metadata: ClientMetadata;
-  useRecoveryToken: boolean;
 }
 
 /** @public */

src/sessions.ts

@@ -536,11 +536,8 @@ function endTransaction(session: ClientSession, commandName: string, callback: C
     callback(e, r);
   }
 
-  if (
+  if (session.transaction.recoveryToken) {
     // Assumption here that commandName is "commitTransaction" or "abortTransaction"
-    session.transaction.recoveryToken &&
-    supportsRecoveryToken(session)
-  ) {
     command.recoveryToken = session.transaction.recoveryToken;
   }
 
@@ -580,11 +577,6 @@ function endTransaction(session: ClientSession, commandName: string, callback: C
   );
 }
 
-function supportsRecoveryToken(session: ClientSession) {
-  const topology = session.topology;
-  return !!topology.s.options.useRecoveryToken;
-}
-
 /** @internal */
 export type ServerSessionId = { id: Binary };
 

test/functional/aggregation.test.js

@@ -22,7 +22,7 @@ describe('Aggregation', function () {
     },
 
     test: function (done) {
-      var client = this.configuration.newClient({ w: 1 }, { poolSize: 1 }),
+      var client = this.configuration.newClient({ w: 1 }, { maxPoolSize: 1 }),
         databaseName = this.configuration.db;
 
       // LINE var MongoClient = require('mongodb').MongoClient;
@@ -99,7 +99,7 @@ describe('Aggregation', function () {
     },
 
     test: function (done) {
-      const client = this.configuration.newClient({ w: 1 }, { poolSize: 1 });
+      const client = this.configuration.newClient({ w: 1 }, { maxPoolSize: 1 });
 
       client.connect(function (err, client) {
         expect(err).to.not.exist;
@@ -139,7 +139,7 @@ describe('Aggregation', function () {
     },
 
     test: function (done) {
-      var client = this.configuration.newClient({ w: 1 }, { poolSize: 1 }),
+      var client = this.configuration.newClient({ w: 1 }, { maxPoolSize: 1 }),
         databaseName = this.configuration.db;
 
       // LINE var MongoClient = require('mongodb').MongoClient;
@@ -227,7 +227,7 @@ describe('Aggregation', function () {
     },
 
     test: function (done) {
-      var client = this.configuration.newClient({ w: 1 }, { poolSize: 1 }),
+      var client = this.configuration.newClient({ w: 1 }, { maxPoolSize: 1 }),
         databaseName = this.configuration.db;
 
       // LINE var MongoClient = require('mongodb').MongoClient;
@@ -315,7 +315,7 @@ describe('Aggregation', function () {
     },
 
     test: function (done) {
-      var client = this.configuration.newClient({ w: 1 }, { poolSize: 1 }),
+      var client = this.configuration.newClient({ w: 1 }, { maxPoolSize: 1 }),
         databaseName = this.configuration.db;
 
       // LINE var MongoClient = require('mongodb').MongoClient;
@@ -400,7 +400,7 @@ describe('Aggregation', function () {
     },
 
     test: function (done) {
-      var client = this.configuration.newClient({ w: 1 }, { poolSize: 1 }),
+      var client = this.configuration.newClient({ w: 1 }, { maxPoolSize: 1 }),
         databaseName = this.configuration.db;
 
       // LINE var MongoClient = require('mongodb').MongoClient;
@@ -488,7 +488,7 @@ describe('Aggregation', function () {
     },
 
     test: function (done) {
-      var client = this.configuration.newClient({ w: 1 }, { poolSize: 1 }),
+      var client = this.configuration.newClient({ w: 1 }, { maxPoolSize: 1 }),
         databaseName = this.configuration.db;
 
       // LINE var MongoClient = require('mongodb').MongoClient;
@@ -578,7 +578,7 @@ describe('Aggregation', function () {
     },
 
     test: function (done) {
-      var client = this.configuration.newClient({ w: 1 }, { poolSize: 1 }),
+      var client = this.configuration.newClient({ w: 1 }, { maxPoolSize: 1 }),
         databaseName = this.configuration.db;
 
       // LINE var MongoClient = require('mongodb').MongoClient;
@@ -663,7 +663,7 @@ describe('Aggregation', function () {
     },
 
     test: function (done) {
-      var client = this.configuration.newClient({ w: 1 }, { poolSize: 1 }),
+      var client = this.configuration.newClient({ w: 1 }, { maxPoolSize: 1 }),
         databaseName = this.configuration.db;
 
       // LINE var MongoClient = require('mongodb').MongoClient;
@@ -751,7 +751,7 @@ describe('Aggregation', function () {
     test: function (done) {
       var databaseName = this.configuration.db;
       var client = this.configuration.newClient(this.configuration.writeConcernMax(), {
-        poolSize: 1
+        maxPoolSize: 1
       });
 
       client.connect(function (err, client) {
@@ -804,7 +804,7 @@ describe('Aggregation', function () {
     test: function (done) {
       var databaseName = this.configuration.db;
       var client = this.configuration.newClient(this.configuration.writeConcernMax(), {
-        poolSize: 1
+        maxPoolSize: 1
       });
 
       client.connect(function (err, client) {
@@ -864,7 +864,7 @@ describe('Aggregation', function () {
     test: function (done) {
       var databaseName = this.configuration.db;
       var client = this.configuration.newClient(this.configuration.writeConcernMax(), {
-        poolSize: 1
+        maxPoolSize: 1
       });
 
       client.connect(function (err, client) {
@@ -939,7 +939,7 @@ describe('Aggregation', function () {
     test: function (done) {
       var databaseName = this.configuration.db;
       var client = this.configuration.newClient(this.configuration.writeConcernMax(), {
-        poolSize: 1
+        maxPoolSize: 1
       });
 
       const testCases = [
@@ -1005,7 +1005,7 @@ describe('Aggregation', function () {
       },
 
       test: function (done) {
-        const client = this.configuration.newClient({ w: 1 }, { poolSize: 1 }),
+        const client = this.configuration.newClient({ w: 1 }, { maxPoolSize: 1 }),
           databaseName = this.configuration.db;
 
         // DOC_LINE var db = new Db('test', new Server('localhost', 27017));
@@ -1133,7 +1133,7 @@ describe('Aggregation', function () {
       }
     },
     test: function (done) {
-      const client = this.configuration.newClient({ w: 1 }, { poolSize: 1 });
+      const client = this.configuration.newClient({ w: 1 }, { maxPoolSize: 1 });
       const databaseName = this.configuration.db;
 
       const comment = 'Darmok and Jalad at Tanagra';
@@ -1176,7 +1176,7 @@ describe('Aggregation', function () {
     test: function (done) {
       var databaseName = this.configuration.db;
       var client = this.configuration.newClient(this.configuration.writeConcernMax(), {
-        poolSize: 1
+        maxPoolSize: 1
       });
 
       // DOC_LINE var client = new MongoClient(new Server('localhost', 27017));
@@ -1243,7 +1243,7 @@ describe('Aggregation', function () {
     test: function (done) {
       var databaseName = this.configuration.db;
       var client = this.configuration.newClient(this.configuration.writeConcernMax(), {
-        poolSize: 1
+        maxPoolSize: 1
       });
 
       // DOC_LINE var client = new MongoClient(new Server('localhost', 27017));
@@ -1284,7 +1284,7 @@ describe('Aggregation', function () {
     test: function (done) {
       const databaseName = this.configuration.db;
       const client = this.configuration.newClient(this.configuration.writeConcernMax(), {
-        poolSize: 1,
+        maxPoolSize: 1,
         monitorCommands: true
       });