mongodb 3.1.13 → 3.2.2

package/HISTORY.md

@@ -2,6 +2,56 @@
 
 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
 
+<a name="3.2.2"></a>
+## [3.2.2](https://github.com/mongodb/node-mongodb-native/compare/v3.2.1...v3.2.2) (2019-03-22)
+
+
+### Bug Fixes
+
+* **asyncIterator:** stronger guard against importing async generator ([e0826fb](https://github.com/mongodb/node-mongodb-native/commit/e0826fb))
+
+
+### Features
+
+* update to mongodb-core v3.2.2 ([868cfc3](https://github.com/mongodb/node-mongodb-native/commit/868cfc3))
+
+
+
+<a name="3.2.1"></a>
+## [3.2.1](https://github.com/mongodb/node-mongodb-native/compare/v3.2.0...v3.2.1) (2019-03-21)
+
+
+### Features
+
+* **core:** update to mongodb-core v3.2.1 ([30b0100](https://github.com/mongodb/node-mongodb-native/commit/30b0100))
+
+
+
+<a name="3.2.0"></a>
+# [3.2.0](https://github.com/mongodb/node-mongodb-native/compare/v3.1.13...v3.2.0) (2019-03-21)
+
+
+### Bug Fixes
+
+* **aggregate:** do not send batchSize for aggregation with $out ([ddb8d90](https://github.com/mongodb/node-mongodb-native/commit/ddb8d90))
+* **bulkWrite:** always count undefined values in bson size for bulk ([436d340](https://github.com/mongodb/node-mongodb-native/commit/436d340))
+* **db_ops:** rename db to add user on ([79931af](https://github.com/mongodb/node-mongodb-native/commit/79931af))
+* **mongo_client_ops:** only skip authentication if no authMechanism is specified ([3b6957d](https://github.com/mongodb/node-mongodb-native/commit/3b6957d))
+* **mongo-client:** ensure close callback is called with client ([f39e881](https://github.com/mongodb/node-mongodb-native/commit/f39e881))
+
+
+### Features
+
+* **core:** pin to mongodb-core v3.2.0 ([22af15a](https://github.com/mongodb/node-mongodb-native/commit/22af15a))
+* **Cursor:** adds support for AsyncIterator in cursors ([b972c1e](https://github.com/mongodb/node-mongodb-native/commit/b972c1e))
+* **db:** add database-level aggregation ([b629b21](https://github.com/mongodb/node-mongodb-native/commit/b629b21))
+* **mongo-client:** remove deprecated `logout` and print warning ([542859d](https://github.com/mongodb/node-mongodb-native/commit/542859d))
+* **topology-base:** support passing callbacks to `close` method ([7c111e0](https://github.com/mongodb/node-mongodb-native/commit/7c111e0))
+* **transactions:** support pinning mongos for sharded txns ([3886127](https://github.com/mongodb/node-mongodb-native/commit/3886127))
+* **unified-sdam:** backport unified SDAM to master for v3.2.0 ([79f33ca](https://github.com/mongodb/node-mongodb-native/commit/79f33ca))
+
+
+
 <a name="3.1.13"></a>
 ## [3.1.13](https://github.com/mongodb/node-mongodb-native/compare/v3.1.12...v3.1.13) (2019-01-23)
 
@@ -222,6 +272,19 @@ All notable changes to this project will be documented in this file. See [standa
 
 
 
+<a name="3.1.1"></a>
+## [3.1.1](https://github.com/mongodb/node-mongodb-native/compare/v3.1.0...v3.1.1) (2018-07-05)
+
+
+### Bug Fixes
+
+* **client-ops:** return transform map to map rather than function ([b8b4bfa](https://github.com/mongodb/node-mongodb-native/commit/b8b4bfa))
+* **collection:** correctly shallow clone passed in options ([2e6c4fa](https://github.com/mongodb/node-mongodb-native/commit/2e6c4fa))
+* **collection:** countDocuments throws error when query doesn't match docs ([4e83556](https://github.com/mongodb/node-mongodb-native/commit/4e83556))
+* **server:** remove unnecessary print statement ([20e11b3](https://github.com/mongodb/node-mongodb-native/commit/20e11b3))
+
+
+
 <a name="3.1.0"></a>
 # [3.1.0](https://github.com/mongodb/node-mongodb-native/compare/v3.0.6...v3.1.0) (2018-06-27)
 

package/README.md

@@ -40,6 +40,13 @@ Core Server (i.e. SERVER) project are **public**.
 
 Change history can be found in [`HISTORY.md`](HISTORY.md).
 
+### Compatibility
+
+For version compatibility matrices, please refer to the following links:
+
+ * [MongoDB](https://docs.mongodb.com/ecosystem/drivers/driver-compatibility-reference/#reference-compatibility-mongodb-node)
+ * [NodeJS](https://docs.mongodb.com/ecosystem/drivers/driver-compatibility-reference/#reference-compatibility-language-node)
+
 # Installation
 
 The recommended way to get started using the Node.js 3.0 driver is by using the `npm` (Node Package Manager) to install the dependency in your project.

package/lib/aggregation_cursor.js

@@ -4,6 +4,8 @@ const inherits = require('util').inherits;
 const MongoError = require('mongodb-core').MongoError;
 const Readable = require('stream').Readable;
 const CoreCursor = require('./cursor');
+const deprecate = require('util').deprecate;
+const SUPPORTS = require('./utils').SUPPORTS;
 
 /**
  * @fileOverview The **AggregationCursor** class is an internal class that embodies an aggregation cursor on MongoDB
@@ -129,6 +131,11 @@ inherits(AggregationCursor, Readable);
 for (var name in CoreCursor.prototype) {
   AggregationCursor.prototype[name] = CoreCursor.prototype[name];
 }
+if (SUPPORTS.ASYNC_ITERATOR) {
+  AggregationCursor.prototype[
+    Symbol.asyncIterator
+  ] = require('./async/async_iterator').asyncIterator;
+}
 
 /**
  * Set the batch size for the cursor.
@@ -153,10 +160,10 @@ AggregationCursor.prototype.batchSize = function(value) {
  * @param {object} document The geoNear stage document.
  * @return {AggregationCursor}
  */
-AggregationCursor.prototype.geoNear = function(document) {
+AggregationCursor.prototype.geoNear = deprecate(function(document) {
   this.s.cmd.pipeline.push({ $geoNear: document });
   return this;
-};
+}, 'The `$geoNear` stage is deprecated in MongoDB 4.0, and removed in version 4.2.');
 
 /**
  * Add a group stage to the aggregation pipeline

package/lib/async/.eslintrc

@@ -0,0 +1,5 @@
+{
+  "parserOptions": {
+    "ecmaVersion": 2018
+  }
+}

package/lib/async/async_iterator.js

@@ -0,0 +1,15 @@
+'use strict';
+
+async function* asyncIterator() {
+  while (true) {
+    const value = await this.next();
+    if (!value) {
+      await this.close();
+      return;
+    }
+
+    yield value;
+  }
+}
+
+exports.asyncIterator = asyncIterator;

package/lib/bulk/ordered.js

@@ -25,7 +25,11 @@ const isPromiseLike = require('../utils').isPromiseLike;
 function addToOperationsList(bulkOperation, docType, document) {
   // Get the bsonSize
   const bsonSize = bson.calculateObjectSize(document, {
-    checkKeys: false
+    checkKeys: false,
+
+    // Since we don't know what the user selected for BSON options here,
+    // err on the safe side, and check the size with ignoreUndefined: false.
+    ignoreUndefined: false
   });
 
   // Throw error if the doc is bigger than the max BSON size

package/lib/bulk/unordered.js

@@ -25,7 +25,11 @@ const isPromiseLike = require('../utils').isPromiseLike;
 function addToOperationsList(bulkOperation, docType, document) {
   // Get the bsonSize
   const bsonSize = bson.calculateObjectSize(document, {
-    checkKeys: false
+    checkKeys: false,
+
+    // Since we don't know what the user selected for BSON options here,
+    // err on the safe side, and check the size with ignoreUndefined: false.
+    ignoreUndefined: false
   });
   // Throw error if the doc is bigger than the max BSON size
   if (bsonSize >= bulkOperation.s.maxBatchSizeBytes)

package/lib/collection.js

@@ -4,7 +4,6 @@ const deprecate = require('util').deprecate;
 const deprecateOptions = require('./utils').deprecateOptions;
 const checkCollectionName = require('./utils').checkCollectionName;
 const ObjectID = require('mongodb-core').BSON.ObjectID;
-const AggregationCursor = require('./aggregation_cursor');
 const MongoError = require('mongodb-core').MongoError;
 const toError = require('./utils').toError;
 const normalizeHintField = require('./utils').normalizeHintField;
@@ -19,10 +18,10 @@ const unordered = require('./bulk/unordered');
 const ordered = require('./bulk/ordered');
 const ChangeStream = require('./change_stream');
 const executeOperation = require('./utils').executeOperation;
-const applyWriteConcern = require('./utils').applyWriteConcern;
 const resolveReadPreference = require('./utils').resolveReadPreference;
 
 // Operations
+const aggregate = require('./operations/aggregate').aggregate;
 const bulkWrite = require('./operations/collection_ops').bulkWrite;
 const checkForAtomicOperators = require('./operations/collection_ops').checkForAtomicOperators;
 const count = require('./operations/collection_ops').count;
@@ -46,12 +45,12 @@ const group = require('./operations/collection_ops').group;
 const indexes = require('./operations/collection_ops').indexes;
 const indexExists = require('./operations/collection_ops').indexExists;
 const indexInformation = require('./operations/collection_ops').indexInformation;
+const insertMany = require('./operations/collection_ops').insertMany;
 const insertOne = require('./operations/collection_ops').insertOne;
 const isCapped = require('./operations/collection_ops').isCapped;
 const mapReduce = require('./operations/collection_ops').mapReduce;
 const optionsOp = require('./operations/collection_ops').optionsOp;
 const parallelCollectionScan = require('./operations/collection_ops').parallelCollectionScan;
-const prepareDocs = require('./operations/collection_ops').prepareDocs;
 const reIndex = require('./operations/collection_ops').reIndex;
 const removeDocuments = require('./operations/collection_ops').removeDocuments;
 const rename = require('./operations/collection_ops').rename;
@@ -464,21 +463,6 @@ Collection.prototype.insertOne = function(doc, options, callback) {
   return executeOperation(this.s.topology, insertOne, [this, doc, options, callback]);
 };
 
-function mapInsertManyResults(docs, r) {
-  const finalResult = {
-    result: { ok: 1, n: r.insertedCount },
-    ops: docs,
-    insertedCount: r.insertedCount,
-    insertedIds: r.insertedIds
-  };
-
-  if (r.getLastOp()) {
-    finalResult.result.opTime = r.getLastOp();
-  }
-
-  return finalResult;
-}
-
 /**
  * Inserts an array of documents into MongoDB. If documents passed in do not contain the **_id** field,
  * one will be added to each of the documents missing it by the driver, mutating the document. This behavior
@@ -502,33 +486,7 @@ Collection.prototype.insertMany = function(docs, options, callback) {
   if (typeof options === 'function') (callback = options), (options = {});
   options = options ? Object.assign({}, options) : { ordered: true };
 
-  if (!Array.isArray(docs) && typeof callback === 'function') {
-    return callback(
-      MongoError.create({ message: 'docs parameter must be an array of documents', driver: true })
-    );
-  } else if (!Array.isArray(docs)) {
-    return new this.s.promiseLibrary((resolve, reject) => {
-      reject(
-        MongoError.create({ message: 'docs parameter must be an array of documents', driver: true })
-      );
-    });
-  }
-
-  // If keep going set unordered
-  options['serializeFunctions'] = options['serializeFunctions'] || this.s.serializeFunctions;
-
-  docs = prepareDocs(this, docs, options);
-
-  // Generate the bulk write operations
-  const operations = [
-    {
-      insertMany: docs
-    }
-  ];
-
-  return executeOperation(this.s.topology, bulkWrite, [this, operations, options, callback], {
-    resultMutator: result => mapInsertManyResults(docs, result)
-  });
+  return executeOperation(this.s.topology, insertMany, [this, docs, options, callback]);
 };
 
 /**
@@ -1434,7 +1392,7 @@ Collection.prototype.countDocuments = function(query, options, callback) {
 };
 
 /**
- * The distinct command returns returns a list of distinct values for the given key across a collection.
+ * The distinct command returns a list of distinct values for the given key across a collection.
  * @method
  * @param {string} key Field of the document to find distinct values for.
  * @param {object} query The query for filtering the set of documents to which we apply the distinct filter.
@@ -1733,97 +1691,7 @@ Collection.prototype.aggregate = function(pipeline, options, callback) {
     pipeline = args;
   }
 
-  // Ignore readConcern option
-  let ignoreReadConcern = false;
-
-  // Build the command
-  const command = { aggregate: this.s.name, pipeline: pipeline };
-
-  // If out was specified
-  if (typeof options.out === 'string') {
-    pipeline.push({ $out: options.out });
-    // Ignore read concern
-    ignoreReadConcern = true;
-  } else if (pipeline.length > 0 && pipeline[pipeline.length - 1]['$out']) {
-    ignoreReadConcern = true;
-  }
-
-  // Decorate command with writeConcern if out has been specified
-  if (
-    pipeline.length > 0 &&
-    pipeline[pipeline.length - 1]['$out'] &&
-    this.s.topology.capabilities().commandsTakeWriteConcern
-  ) {
-    applyWriteConcern(command, { db: this.s.db, collection: this }, options);
-  }
-
-  // Have we specified collation
-  try {
-    decorateWithCollation(command, this, options);
-  } catch (err) {
-    if (typeof callback === 'function') return callback(err, null);
-    throw err;
-  }
-
-  // If we have bypassDocumentValidation set
-  if (options.bypassDocumentValidation === true) {
-    command.bypassDocumentValidation = options.bypassDocumentValidation;
-  }
-
-  // Do we have a readConcern specified
-  if (!ignoreReadConcern) {
-    decorateWithReadConcern(command, this, options);
-  }
-
-  // If we have allowDiskUse defined
-  if (options.allowDiskUse) command.allowDiskUse = options.allowDiskUse;
-  if (typeof options.maxTimeMS === 'number') command.maxTimeMS = options.maxTimeMS;
-
-  // If we are giving a hint
-  if (options.hint) command.hint = options.hint;
-
-  options = Object.assign({}, options);
-  // Ensure we have the right read preference inheritance
-  options.readPreference = resolveReadPreference(options, { db: this.s.db, collection: this });
-
-  // If explain has been specified add it
-  if (options.explain) {
-    if (command.readConcern || command.writeConcern) {
-      throw toError('"explain" cannot be used on an aggregate call with readConcern/writeConcern');
-    }
-    command.explain = options.explain;
-  }
-
-  if (typeof options.comment === 'string') command.comment = options.comment;
-
-  // Validate that cursor options is valid
-  if (options.cursor != null && typeof options.cursor !== 'object') {
-    throw toError('cursor options must be an object');
-  }
-
-  options.cursor = options.cursor || {};
-  if (options.batchSize) options.cursor.batchSize = options.batchSize;
-  command.cursor = options.cursor;
-
-  // promiseLibrary
-  options.promiseLibrary = this.s.promiseLibrary;
-
-  // Set the AggregationCursor constructor
-  options.cursorFactory = AggregationCursor;
-  if (typeof callback !== 'function') {
-    if (!this.s.topology.capabilities()) {
-      throw new MongoError('cannot connect to server');
-    }
-
-    // Allow disk usage command
-    if (typeof options.allowDiskUse === 'boolean') command.allowDiskUse = options.allowDiskUse;
-    if (typeof options.maxTimeMS === 'number') command.maxTimeMS = options.maxTimeMS;
-
-    // Execute the cursor
-    return this.s.topology.cursor(this.s.namespace, command, options);
-  }
-
-  return handleCallback(callback, null, this.s.topology.cursor(this.s.namespace, command, options));
+  return aggregate(this.s.db, this, pipeline, options, callback);
 };
 
 /**
@@ -1874,7 +1742,7 @@ Collection.prototype.watch = function(pipeline, options) {
  * @param {Collection~parallelCollectionScanCallback} [callback] The command result callback
  * @return {Promise} returns Promise if no callback passed
  */
-Collection.prototype.parallelCollectionScan = function(options, callback) {
+Collection.prototype.parallelCollectionScan = deprecate(function(options, callback) {
   if (typeof options === 'function') (callback = options), (options = { numCursors: 1 });
   // Set number of cursors to 1
   options.numCursors = options.numCursors || 1;
@@ -1894,7 +1762,7 @@ Collection.prototype.parallelCollectionScan = function(options, callback) {
   return executeOperation(this.s.topology, parallelCollectionScan, [this, options, callback], {
     skipSessions: true
   });
-};
+}, 'parallelCollectionScan is deprecated in MongoDB v4.1');
 
 /**
  * Execute a geo search using a geo haystack index on a collection.

package/lib/command_cursor.js

@@ -5,6 +5,7 @@ const ReadPreference = require('mongodb-core').ReadPreference;
 const MongoError = require('mongodb-core').MongoError;
 const Readable = require('stream').Readable;
 const CoreCursor = require('./cursor');
+const SUPPORTS = require('./utils').SUPPORTS;
 
 /**
  * @fileOverview The **CommandCursor** class is an internal class that embodies a
@@ -156,6 +157,10 @@ for (var i = 0; i < methodsToInherit.length; i++) {
   CommandCursor.prototype[methodsToInherit[i]] = CoreCursor.prototype[methodsToInherit[i]];
 }
 
+if (SUPPORTS.ASYNC_ITERATOR) {
+  CommandCursor.prototype[Symbol.asyncIterator] = require('./async/async_iterator').asyncIterator;
+}
+
 /**
  * Set the ReadPreference for the cursor.
  * @method

package/lib/cursor.js

@@ -5,6 +5,7 @@ const PassThrough = require('stream').PassThrough;
 const inherits = require('util').inherits;
 const deprecate = require('util').deprecate;
 const handleCallback = require('./utils').handleCallback;
+const SUPPORTS = require('./utils').SUPPORTS;
 const ReadPreference = require('mongodb-core').ReadPreference;
 const MongoError = require('mongodb-core').MongoError;
 const Readable = require('stream').Readable;
@@ -203,6 +204,10 @@ function Cursor(bson, ns, cmd, options, topology, topologyOptions) {
 // Inherit from Readable
 inherits(Cursor, Readable);
 
+if (SUPPORTS.ASYNC_ITERATOR) {
+  Cursor.prototype[Symbol.asyncIterator] = require('./async/async_iterator').asyncIterator;
+}
+
 // Map core cursor _next method so we can apply mapping
 Cursor.prototype._next = function() {
   if (this._initImplicitSession) {

package/lib/db.js

@@ -23,6 +23,7 @@ const CONSTANTS = require('./constants');
 
 // Operations
 const addUser = require('./operations/db_ops').addUser;
+const aggregate = require('./operations/aggregate').aggregate;
 const collections = require('./operations/db_ops').collections;
 const createCollection = require('./operations/db_ops').createCollection;
 const createIndex = require('./operations/db_ops').createIndex;
@@ -263,6 +264,44 @@ Db.prototype.command = function(command, options, callback) {
   return executeOperation(this.s.topology, executeCommand, [this, command, options, callback]);
 };
 
+/**
+ * Execute an aggregation framework pipeline against the database, needs MongoDB >= 3.6
+ * @method
+ * @param {object} [pipeline=[]] Array containing all the aggregation framework commands for the execution.
+ * @param {object} [options] Optional settings.
+ * @param {(ReadPreference|string)} [options.readPreference] The preferred read preference (ReadPreference.PRIMARY, ReadPreference.PRIMARY_PREFERRED, ReadPreference.SECONDARY, ReadPreference.SECONDARY_PREFERRED, ReadPreference.NEAREST).
+ * @param {object} [options.cursor] Return the query as cursor, on 2.6 > it returns as a real cursor on pre 2.6 it returns as an emulated cursor.
+ * @param {number} [options.cursor.batchSize] The batchSize for the cursor
+ * @param {boolean} [options.explain=false] Explain returns the aggregation execution plan (requires mongodb 2.6 >).
+ * @param {boolean} [options.allowDiskUse=false] allowDiskUse lets the server know if it can use disk to store temporary results for the aggregation (requires mongodb 2.6 >).
+ * @param {number} [options.maxTimeMS] maxTimeMS specifies a cumulative time limit in milliseconds for processing operations on the cursor. MongoDB interrupts the operation at the earliest following interrupt point.
+ * @param {boolean} [options.bypassDocumentValidation=false] Allow driver to bypass schema validation in MongoDB 3.2 or higher.
+ * @param {boolean} [options.raw=false] Return document results as raw BSON buffers.
+ * @param {boolean} [options.promoteLongs=true] Promotes Long values to number if they fit inside the 53 bits resolution.
+ * @param {boolean} [options.promoteValues=true] Promotes BSON values to native types where possible, set to false to only receive wrapper types.
+ * @param {boolean} [options.promoteBuffers=false] Promotes Binary BSON values to native Node Buffers.
+ * @param {object} [options.collation] Specify collation (MongoDB 3.4 or higher) settings for update operation (see 3.4 documentation for available fields).
+ * @param {string} [options.comment] Add a comment to an aggregation command
+ * @param {string|object} [options.hint] Add an index selection hint to an aggregation command
+ * @param {ClientSession} [options.session] optional session to use for this operation
+ * @param {Database~aggregationCallback} callback The command result callback
+ * @return {(null|AggregationCursor)}
+ */
+Db.prototype.aggregate = function(pipeline, options, callback) {
+  if (typeof options === 'function') {
+    callback = options;
+    options = {};
+  }
+
+  // If we have no options or callback we are doing
+  // a cursor based aggregation
+  if (options == null && callback == null) {
+    options = {};
+  }
+
+  return aggregate(this, '1', pipeline, options, callback);
+};
+
 /**
  * Return the Admin db instance
  * @method
@@ -281,6 +320,13 @@ Db.prototype.admin = function() {
  * @param {Collection} collection The collection instance.
  */
 
+/**
+ * The callback format for an aggregation call
+ * @callback Database~aggregationCallback
+ * @param {MongoError} error An error instance representing the error during the execution.
+ * @param {AggregationCursor} cursor The cursor if the aggregation command was executed successfully.
+ */
+
 const collectionKeys = [
   'pkFactory',
   'readPreference',

package/lib/mongo_client.js

@@ -4,14 +4,14 @@ const ChangeStream = require('./change_stream');
 const Db = require('./db');
 const EventEmitter = require('events').EventEmitter;
 const executeOperation = require('./utils').executeOperation;
-const handleCallback = require('./utils').handleCallback;
 const inherits = require('util').inherits;
 const MongoError = require('mongodb-core').MongoError;
+const deprecate = require('util').deprecate;
 
 // Operations
 const connectOp = require('./operations/mongo_client_ops').connectOp;
-const logout = require('./operations/mongo_client_ops').logout;
 const validOptions = require('./operations/mongo_client_ops').validOptions;
+const closeOperation = require('./operations/mongo_client_ops').closeOperation;
 
 /**
  * @fileOverview The **MongoClient** class is a class that allows for making Connections to MongoDB.
@@ -110,6 +110,7 @@ const validOptions = require('./operations/mongo_client_ops').validOptions;
  * @param {boolean} [options.monitorCommands=false] Enable command monitoring for this client
  * @param {number} [options.minSize] If present, the connection pool will be initialized with minSize connections, and will never dip below minSize connections
  * @param {boolean} [options.useNewUrlParser=false] Determines whether or not to use the new url parser. Enables the new, spec-compliant, url parser shipped in the core driver. This url parser fixes a number of problems with the original parser, and aims to outright replace that parser in the near future.
+ * @param {boolean} [options.useUnifiedTopology] Enables the new unified topology layer
  * @param {MongoClient~connectCallback} [callback] The command result callback
  * @return {MongoClient} a MongoClient instance
  */
@@ -170,25 +171,10 @@ MongoClient.prototype.connect = function(callback) {
   });
 };
 
-/**
- * Logout user from server, fire off on all connections and remove all auth info
- * @method
- * @param {object} [options] Optional settings.
- * @param {string} [options.dbName] Logout against different database than current.
- * @param {Db~resultCallback} [callback] The command result callback
- * @return {Promise} returns Promise if no callback passed
- */
-MongoClient.prototype.logout = function(options, callback) {
+MongoClient.prototype.logout = deprecate(function(options, callback) {
   if (typeof options === 'function') (callback = options), (options = {});
-  options = options || {};
-
-  // Establish the correct database name
-  const dbName = this.s.options.authSource ? this.s.options.authSource : this.s.options.dbName;
-
-  return executeOperation(this, logout, [this, dbName, callback], {
-    skipSessions: true
-  });
-};
+  if (typeof callback === 'function') callback(null, true);
+}, 'Multiple authentication is prohibited on a connected client, please only authenticate once per MongoClient');
 
 /**
  * Close the db and its underlying connections
@@ -199,31 +185,8 @@ MongoClient.prototype.logout = function(options, callback) {
  */
 MongoClient.prototype.close = function(force, callback) {
   if (typeof force === 'function') (callback = force), (force = false);
-
-  // Close the topology connection
-  if (this.topology) {
-    this.topology.close(force);
-  }
-  // Emit close event
-  this.emit('close', this);
-
-  // Fire close event on any cached db instances
-  for (const name in this.s.dbCache) {
-    this.s.dbCache[name].emit('close');
-  }
-
-  // Remove listeners after emit
-  this.removeAllListeners('close');
-
-  // Callback after next event loop tick
-  if (typeof callback === 'function')
-    return process.nextTick(() => {
-      handleCallback(callback, null);
-    });
-
-  // Return dummy promise
-  return new this.s.promiseLibrary(resolve => {
-    resolve();
+  return executeOperation(this, closeOperation, [this, force, callback], {
+    skipSessions: true
   });
 };