mongodb 3.2.0-beta1 → 3.2.3

package/HISTORY.md

@@ -2,6 +2,74 @@
 
 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.3"></a>
+## [3.2.3](https://github.com/mongodb/node-mongodb-native/compare/v3.2.2...v3.2.3) (2019-04-05)
+
+
+### Bug Fixes
+
+* **aggregation:** fix field name typo ([4235d04](https://github.com/mongodb/node-mongodb-native/commit/4235d04))
+* **async:** rewrote asyncGenerator in node < 10 syntax ([49c8cef](https://github.com/mongodb/node-mongodb-native/commit/49c8cef))
+* **bulkWrite:** fix issue with bulkWrite continuing w/ callback ([2a4a42c](https://github.com/mongodb/node-mongodb-native/commit/2a4a42c))
+* **docs:** correctly document that default for `sslValidate` is false ([1f8e7fa](https://github.com/mongodb/node-mongodb-native/commit/1f8e7fa))
+
+
+### Features
+
+* update to mongodb-core v3.2.3 ([1c5357a](https://github.com/mongodb/node-mongodb-native/commit/1c5357a))
+
+
+
+<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 +290,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

@@ -5,6 +5,7 @@ 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
@@ -130,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.
@@ -142,7 +148,7 @@ AggregationCursor.prototype.batchSize = function(value) {
   if (this.s.state === AggregationCursor.CLOSED || this.isDead())
     throw MongoError.create({ message: 'Cursor is closed', driver: true });
   if (typeof value !== 'number')
-    throw MongoError.create({ message: 'batchSize requires an integer', drvier: true });
+    throw MongoError.create({ message: 'batchSize requires an integer', driver: true });
   if (this.s.cmd.cursor) this.s.cmd.cursor.batchSize = value;
   this.setCursorBatchSize(value);
   return this;
@@ -320,7 +326,7 @@ AggregationCursor.prototype.get = AggregationCursor.prototype.toArray;
 /**
  * Returns an array of documents. The caller is responsible for making sure that there
  * is enough memory to store the results. Note that the array only contain partial
- * results when this cursor had been previouly accessed. In that case,
+ * results when this cursor had been previously accessed. In that case,
  * cursor.rewind() can be used to reset the cursor.
  * @method AggregationCursor.prototype.toArray
  * @param {AggregationCursor~toArrayResultCallback} [callback] The result callback.
@@ -337,7 +343,7 @@ AggregationCursor.prototype.get = AggregationCursor.prototype.toArray;
 
 /**
  * Iterates over all the documents for this cursor. As with **{cursor.toArray}**,
- * not all of the elements will be iterated if this cursor had been previouly accessed.
+ * not all of the elements will be iterated if this cursor had been previously accessed.
  * In that case, **{cursor.rewind}** can be used to reset the cursor. However, unlike
  * **{cursor.toArray}**, the cursor will only hold a maximum of batch size elements
  * at any given time if batch size is specified. Otherwise, the caller is responsible

package/lib/async/.eslintrc

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

package/lib/async/async_iterator.js

@@ -0,0 +1,33 @@
+'use strict';
+
+// async function* asyncIterator() {
+//   while (true) {
+//     const value = await this.next();
+//     if (!value) {
+//       await this.close();
+//       return;
+//     }
+
+//     yield value;
+//   }
+// }
+
+// TODO: change this to the async generator function above
+function asyncIterator() {
+  const cursor = this;
+
+  return {
+    next: function() {
+      return Promise.resolve()
+        .then(() => cursor.next())
+        .then(value => {
+          if (!value) {
+            return cursor.close().then(() => ({ value, done: true }));
+          }
+          return { value, done: false };
+        });
+    }
+  };
+}
+
+exports.asyncIterator = asyncIterator;

package/lib/bulk/common.js

@@ -55,7 +55,7 @@ class Batch {
 }
 
 /**
- * Wraps a legacy operation so we can correctly rewrite it's error
+ * Wraps a legacy operation so we can correctly rewrite its error
  * @ignore
  */
 class LegacyOp {
@@ -906,6 +906,15 @@ class BulkOperationBase {
     );
   }
 
+  _handleEarlyError(err, callback) {
+    if (typeof callback === 'function') {
+      callback(err, null);
+      return;
+    }
+
+    return this.s.promiseLibrary.reject(err);
+  }
+
   /**
    * Execute next write command in a chain
    *
@@ -919,19 +928,17 @@ class BulkOperationBase {
     if (typeof options === 'function') (callback = options), (options = {});
     options = options || {};
 
-    if (this.s.executed) {
-      const executedError = toError('batch cannot be re-executed');
-      return typeof callback === 'function'
-        ? callback(executedError, null)
-        : this.s.promiseLibrary.reject(executedError);
-    }
-
     if (typeof _writeConcern === 'function') {
       callback = _writeConcern;
     } else if (_writeConcern && typeof _writeConcern === 'object') {
       this.s.writeConcern = _writeConcern;
     }
 
+    if (this.s.executed) {
+      const executedError = toError('batch cannot be re-executed');
+      return this._handleEarlyError(executedError, callback);
+    }
+
     // If we have current batch
     if (this.isOrdered) {
       if (this.s.currentBatch) this.s.batches.push(this.s.currentBatch);
@@ -943,9 +950,7 @@ class BulkOperationBase {
     // If we have no operations in the bulk raise an error
     if (this.s.batches.length === 0) {
       const emptyBatchError = toError('Invalid Operation, no operations specified');
-      return typeof callback === 'function'
-        ? callback(emptyBatchError, null)
-        : this.s.promiseLibrary.reject(emptyBatchError);
+      return this._handleEarlyError(emptyBatchError, callback);
     }
     return { options, callback };
   }

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
@@ -115,7 +119,7 @@ class OrderedBulkOperation extends BulkOperationBase {
    */
   execute(_writeConcern, options, callback) {
     const ret = this.bulkExecute(_writeConcern, options, callback);
-    if (isPromiseLike(ret)) {
+    if (!ret || isPromiseLike(ret)) {
       return ret;
     }
 

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)
@@ -127,7 +131,7 @@ class UnorderedBulkOperation extends BulkOperationBase {
    */
   execute(_writeConcern, options, callback) {
     const ret = this.bulkExecute(_writeConcern, options, callback);
-    if (isPromiseLike(ret)) {
+    if (!ret || isPromiseLike(ret)) {
       return ret;
     }
 

package/lib/collection.js

@@ -45,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;
@@ -268,7 +268,7 @@ const DEPRECATED_FIND_OPTIONS = ['maxScan', 'fields', 'snapshot'];
  * @param {boolean} [options.promoteBuffers=false] Promotes Binary BSON values to native Node Buffers.
  * @param {(ReadPreference|string)} [options.readPreference] The preferred read preference (ReadPreference.PRIMARY, ReadPreference.PRIMARY_PREFERRED, ReadPreference.SECONDARY, ReadPreference.SECONDARY_PREFERRED, ReadPreference.NEAREST).
  * @param {boolean} [options.partial=false] Specify if the cursor should return partial results when querying against a sharded system
- * @param {number} [options.maxTimeMS] Number of miliseconds to wait before aborting the query.
+ * @param {number} [options.maxTimeMS] Number of milliseconds to wait before aborting the query.
  * @param {object} [options.collation] Specify collation (MongoDB 3.4 or higher) settings for update operation (see 3.4 documentation for available fields).
  * @param {ClientSession} [options.session] optional session to use for this operation
  * @throws {MongoError}
@@ -454,7 +454,7 @@ Collection.prototype.insertOne = function(doc, options, callback) {
   if (typeof options === 'function') (callback = options), (options = {});
   options = options || {};
 
-  // Add ignoreUndfined
+  // Add ignoreUndefined
   if (this.s.options.ignoreUndefined) {
     options = Object.assign({}, options);
     options.ignoreUndefined = this.s.options.ignoreUndefined;
@@ -463,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
@@ -501,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]);
 };
 
 /**
@@ -726,7 +685,7 @@ Collection.prototype.updateOne = function(filter, update, options, callback) {
 
   options = Object.assign({}, options);
 
-  // Add ignoreUndfined
+  // Add ignoreUndefined
   if (this.s.options.ignoreUndefined) {
     options = Object.assign({}, options);
     options.ignoreUndefined = this.s.options.ignoreUndefined;
@@ -754,7 +713,7 @@ Collection.prototype.replaceOne = function(filter, doc, options, callback) {
   if (typeof options === 'function') (callback = options), (options = {});
   options = Object.assign({}, options);
 
-  // Add ignoreUndfined
+  // Add ignoreUndefined
   if (this.s.options.ignoreUndefined) {
     options = Object.assign({}, options);
     options.ignoreUndefined = this.s.options.ignoreUndefined;
@@ -790,7 +749,7 @@ Collection.prototype.updateMany = function(filter, update, options, callback) {
 
   options = Object.assign({}, options);
 
-  // Add ignoreUndfined
+  // Add ignoreUndefined
   if (this.s.options.ignoreUndefined) {
     options = Object.assign({}, options);
     options.ignoreUndefined = this.s.options.ignoreUndefined;
@@ -823,7 +782,7 @@ Collection.prototype.update = deprecate(function(selector, update, options, call
   if (typeof options === 'function') (callback = options), (options = {});
   options = options || {};
 
-  // Add ignoreUndfined
+  // Add ignoreUndefined
   if (this.s.options.ignoreUndefined) {
     options = Object.assign({}, options);
     options.ignoreUndefined = this.s.options.ignoreUndefined;
@@ -870,7 +829,7 @@ Collection.prototype.deleteOne = function(filter, options, callback) {
   if (typeof options === 'function') (callback = options), (options = {});
   options = Object.assign({}, options);
 
-  // Add ignoreUndfined
+  // Add ignoreUndefined
   if (this.s.options.ignoreUndefined) {
     options = Object.assign({}, options);
     options.ignoreUndefined = this.s.options.ignoreUndefined;
@@ -897,7 +856,7 @@ Collection.prototype.deleteMany = function(filter, options, callback) {
   if (typeof options === 'function') (callback = options), (options = {});
   options = Object.assign({}, options);
 
-  // Add ignoreUndfined
+  // Add ignoreUndefined
   if (this.s.options.ignoreUndefined) {
     options = Object.assign({}, options);
     options.ignoreUndefined = this.s.options.ignoreUndefined;
@@ -926,7 +885,7 @@ Collection.prototype.remove = deprecate(function(selector, options, callback) {
   if (typeof options === 'function') (callback = options), (options = {});
   options = options || {};
 
-  // Add ignoreUndfined
+  // Add ignoreUndefined
   if (this.s.options.ignoreUndefined) {
     options = Object.assign({}, options);
     options.ignoreUndefined = this.s.options.ignoreUndefined;
@@ -953,7 +912,7 @@ Collection.prototype.save = deprecate(function(doc, options, callback) {
   if (typeof options === 'function') (callback = options), (options = {});
   options = options || {};
 
-  // Add ignoreUndfined
+  // Add ignoreUndefined
   if (this.s.options.ignoreUndefined) {
     options = Object.assign({}, options);
     options.ignoreUndefined = this.s.options.ignoreUndefined;
@@ -1004,7 +963,7 @@ Collection.prototype.save = deprecate(function(doc, options, callback) {
  * @param {boolean} [options.promoteBuffers=false] Promotes Binary BSON values to native Node Buffers.
  * @param {(ReadPreference|string)} [options.readPreference] The preferred read preference (ReadPreference.PRIMARY, ReadPreference.PRIMARY_PREFERRED, ReadPreference.SECONDARY, ReadPreference.SECONDARY_PREFERRED, ReadPreference.NEAREST).
  * @param {boolean} [options.partial=false] Specify if the cursor should return partial results when querying against a sharded system
- * @param {number} [options.maxTimeMS] Number of miliseconds to wait before aborting the query.
+ * @param {number} [options.maxTimeMS] Number of milliseconds to wait before aborting the query.
  * @param {object} [options.collation] Specify collation (MongoDB 3.4 or higher) settings for update operation (see 3.4 documentation for available fields).
  * @param {ClientSession} [options.session] optional session to use for this operation
  * @param {Collection~resultCallback} [callback] The command result callback
@@ -1167,7 +1126,7 @@ Collection.prototype.createIndexes = function(indexSpecs, options, callback) {
  * @param {number} [options.wtimeout] The write concern timeout.
  * @param {boolean} [options.j=false] Specify a journal write concern.
  * @param {ClientSession} [options.session] optional session to use for this operation
- * @param {number} [options.maxTimeMS] Number of miliseconds to wait before aborting the query.
+ * @param {number} [options.maxTimeMS] Number of milliseconds to wait before aborting the query.
  * @param {Collection~resultCallback} [callback] The command result callback
  * @return {Promise} returns Promise if no callback passed
  */
@@ -1187,7 +1146,7 @@ Collection.prototype.dropIndex = function(indexName, options, callback) {
  * @method
  * @param {Object} [options] Optional settings
  * @param {ClientSession} [options.session] optional session to use for this operation
- * @param {number} [options.maxTimeMS] Number of miliseconds to wait before aborting the query.
+ * @param {number} [options.maxTimeMS] Number of milliseconds to wait before aborting the query.
  * @param {Collection~resultCallback} [callback] The command result callback
  * @return {Promise} returns Promise if no callback passed
  */
@@ -1359,7 +1318,7 @@ Collection.prototype.indexInformation = function(options, callback) {
  * @param {boolean} [options.skip] The number of documents to skip for the count.
  * @param {string} [options.hint] An index name hint for the query.
  * @param {(ReadPreference|string)} [options.readPreference] The preferred read preference (ReadPreference.PRIMARY, ReadPreference.PRIMARY_PREFERRED, ReadPreference.SECONDARY, ReadPreference.SECONDARY_PREFERRED, ReadPreference.NEAREST).
- * @param {number} [options.maxTimeMS] Number of miliseconds to wait before aborting the query.
+ * @param {number} [options.maxTimeMS] Number of milliseconds to wait before aborting the query.
  * @param {ClientSession} [options.session] optional session to use for this operation
  * @param {Collection~countCallback} [callback] The command result callback
  * @return {Promise} returns Promise if no callback passed
@@ -1439,7 +1398,7 @@ Collection.prototype.countDocuments = function(query, options, callback) {
  * @param {object} query The query for filtering the set of documents to which we apply the distinct filter.
  * @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 {number} [options.maxTimeMS] Number of miliseconds to wait before aborting the query.
+ * @param {number} [options.maxTimeMS] Number of milliseconds to wait before aborting the query.
  * @param {ClientSession} [options.session] optional session to use for this operation
  * @param {Collection~resultCallback} [callback] The command result callback
  * @return {Promise} returns Promise if no callback passed

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
@@ -254,7 +259,7 @@ CommandCursor.prototype.get = CommandCursor.prototype.toArray;
 /**
  * Returns an array of documents. The caller is responsible for making sure that there
  * is enough memory to store the results. Note that the array only contain partial
- * results when this cursor had been previouly accessed.
+ * results when this cursor had been previously accessed.
  * @method CommandCursor.prototype.toArray
  * @param {CommandCursor~toArrayResultCallback} [callback] The result callback.
  * @throws {MongoError}
@@ -270,7 +275,7 @@ CommandCursor.prototype.get = CommandCursor.prototype.toArray;
 
 /**
  * Iterates over all the documents for this cursor. As with **{cursor.toArray}**,
- * not all of the elements will be iterated if this cursor had been previouly accessed.
+ * not all of the elements will be iterated if this cursor had been previously accessed.
  * In that case, **{cursor.rewind}** can be used to reset the cursor. However, unlike
  * **{cursor.toArray}**, the cursor will only hold a maximum of batch size elements
  * at any given time if batch size is specified. Otherwise, the caller is responsible

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) {
@@ -688,7 +693,7 @@ Cursor.prototype.skip = function(value) {
 
 /**
  * Iterates over all the documents for this cursor. As with **{cursor.toArray}**,
- * not all of the elements will be iterated if this cursor had been previouly accessed.
+ * not all of the elements will be iterated if this cursor had been previously accessed.
  * In that case, **{cursor.rewind}** can be used to reset the cursor. However, unlike
  * **{cursor.toArray}**, the cursor will only hold a maximum of batch size elements
  * at any given time if batch size is specified. Otherwise, the caller is responsible
@@ -806,7 +811,7 @@ Cursor.prototype.setReadPreference = function(readPreference) {
 /**
  * Returns an array of documents. The caller is responsible for making sure that there
  * is enough memory to store the results. Note that the array only contains partial
- * results when this cursor had been previouly accessed. In that case,
+ * results when this cursor had been previously accessed. In that case,
  * cursor.rewind() can be used to reset the cursor.
  * @method
  * @param {Cursor~toArrayResultCallback} [callback] The result callback.
@@ -840,7 +845,7 @@ Cursor.prototype.toArray = function(callback) {
  * @param {object} [options] Optional settings.
  * @param {number} [options.skip] The number of documents to skip.
  * @param {number} [options.limit] The maximum amounts to count before aborting.
- * @param {number} [options.maxTimeMS] Number of miliseconds to wait before aborting the query.
+ * @param {number} [options.maxTimeMS] Number of milliseconds to wait before aborting the query.
  * @param {string} [options.hint] An index name hint for the query.
  * @param {(ReadPreference|string)} [options.readPreference] The preferred read preference (ReadPreference.PRIMARY, ReadPreference.PRIMARY_PREFERRED, ReadPreference.SECONDARY, ReadPreference.SECONDARY_PREFERRED, ReadPreference.NEAREST).
  * @param {Cursor~countResultCallback} [callback] The result callback.

package/lib/db.js

@@ -113,7 +113,7 @@ const legalOptionNames = [
  * @param {object} [options.pkFactory] A primary key factory object for generation of custom _id keys.
  * @param {object} [options.promiseLibrary] A Promise library class the application wishes to use such as Bluebird, must be ES6 compatible
  * @param {object} [options.readConcern] Specify a read concern for the collection. (only MongoDB 3.2 or higher supported)
- * @param {object} [options.readConcern.level='local'] Specify a read concern level for the collection operations, one of [local|majority]. (only MongoDB 3.2 or higher supported)
+ * @param {ReadConcernLevel} [options.readConcern.level='local'] Specify a read concern level for the collection operations (only MongoDB 3.2 or higher supported)
  * @property {(Server|ReplSet|Mongos)} serverConfig Get the current db topology.
  * @property {number} bufferMaxEntries Current bufferMaxEntries value for the database
  * @property {string} databaseName The name of the database this instance represents.
@@ -355,7 +355,7 @@ const collectionKeys = [
  * @param {boolean} [options.serializeFunctions=false] Serialize functions on any object.
  * @param {boolean} [options.strict=false] Returns an error if the collection does not exist
  * @param {object} [options.readConcern] Specify a read concern for the collection. (only MongoDB 3.2 or higher supported)
- * @param {object} [options.readConcern.level='local'] Specify a read concern level for the collection operations, one of [local|majority]. (only MongoDB 3.2 or higher supported)
+ * @param {ReadConcernLevel} [options.readConcern.level='local'] Specify a read concern level for the collection operations (only MongoDB 3.2 or higher supported)
  * @param {Db~collectionResultCallback} [callback] The collection result callback
  * @return {Collection} return the new Collection instance if not in strict mode
  */
@@ -595,7 +595,7 @@ Db.prototype.listCollections = function(filter, options) {
  * @param {Code} code JavaScript to execute on server.
  * @param {(object|array)} parameters The parameters for the call.
  * @param {object} [options] Optional settings.
- * @param {boolean} [options.nolock=false] Tell MongoDB not to block on the evaulation of the javascript.
+ * @param {boolean} [options.nolock=false] Tell MongoDB not to block on the evaluation of the javascript.
  * @param {ClientSession} [options.session] optional session to use for this operation
  * @param {Db~resultCallback} [callback] The results callback
  * @deprecated Eval is deprecated on MongoDB 3.2 and forward
@@ -867,7 +867,7 @@ Db.prototype.setProfilingLevel = function(level, options, callback) {
 };
 
 /**
- * Retrive the current profiling information for MongoDB
+ * Retrieve the current profiling information for MongoDB
  *
  * @param {Object} [options] Optional settings
  * @param {ClientSession} [options.session] optional session to use for this operation

package/lib/gridfs/grid_store.js

@@ -65,7 +65,7 @@ const deprecationFn = deprecate(() => {},
  *
  * Modes
  *  - **"r"** - read only. This is the default mode.
- *  - **"w"** - write in truncate mode. Existing data will be overwriten.
+ *  - **"w"** - write in truncate mode. Existing data will be overwritten.
  *
  * @class
  * @param {Db} db A database instance to interact with.

package/lib/mongo_client.js

@@ -4,7 +4,6 @@ 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;
@@ -12,6 +11,7 @@ const deprecate = require('util').deprecate;
 // Operations
 const connectOp = require('./operations/mongo_client_ops').connectOp;
 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.
@@ -46,6 +46,12 @@ const validOptions = require('./operations/mongo_client_ops').validOptions;
  * });
  */
 
+/**
+ * A string specifying the level of a ReadConcern
+ * @typedef {'local'|'available'|'majority'|'linearizable'|'snapshot'} ReadConcernLevel
+ * @see https://docs.mongodb.com/manual/reference/read-concern/index.html#read-concern-levels
+ */
+
 /**
  * Creates a new MongoClient instance
  * @class
@@ -53,7 +59,7 @@ const validOptions = require('./operations/mongo_client_ops').validOptions;
  * @param {object} [options] Optional settings
  * @param {number} [options.poolSize=5] The maximum size of the individual server pool
  * @param {boolean} [options.ssl=false] Enable SSL connection.
- * @param {boolean} [options.sslValidate=true] Validate mongod server certificate against Certificate Authority
+ * @param {boolean} [options.sslValidate=false] Validate mongod server certificate against Certificate Authority
  * @param {buffer} [options.sslCA=undefined] SSL Certificate store binary buffer
  * @param {buffer} [options.sslCert=undefined] SSL Certificate binary buffer
  * @param {buffer} [options.sslKey=undefined] SSL Key file binary buffer
@@ -88,7 +94,7 @@ const validOptions = require('./operations/mongo_client_ops').validOptions;
  * @param {object} [options.pkFactory] A primary key factory object for generation of custom _id keys
  * @param {object} [options.promiseLibrary] A Promise library class the application wishes to use such as Bluebird, must be ES6 compatible
  * @param {object} [options.readConcern] Specify a read concern for the collection (only MongoDB 3.2 or higher supported)
- * @param {string} [options.readConcern.level='local'] Specify a read concern level for the collection operations, one of [local|majority]. (only MongoDB 3.2 or higher supported)
+ * @param {ReadConcernLevel} [options.readConcern.level='local'] Specify a read concern level for the collection operations (only MongoDB 3.2 or higher supported)
  * @param {number} [options.maxStalenessSeconds=undefined] The max staleness to secondary reads (values under 10 seconds cannot be guaranteed)
  * @param {string} [options.loggerLevel=undefined] The logging level (error/warn/info/debug)
  * @param {object} [options.logger=undefined] Custom logger object
@@ -110,6 +116,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
  */
@@ -184,31 +191,8 @@ MongoClient.prototype.logout = deprecate(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
   });
 };
 
@@ -287,7 +271,7 @@ MongoClient.prototype.isConnected = function(options) {
  * @param {object} [options] Optional settings
  * @param {number} [options.poolSize=5] The maximum size of the individual server pool
  * @param {boolean} [options.ssl=false] Enable SSL connection.
- * @param {boolean} [options.sslValidate=true] Validate mongod server certificate against Certificate Authority
+ * @param {boolean} [options.sslValidate=false] Validate mongod server certificate against Certificate Authority
  * @param {buffer} [options.sslCA=undefined] SSL Certificate store binary buffer
  * @param {buffer} [options.sslCert=undefined] SSL Certificate binary buffer
  * @param {buffer} [options.sslKey=undefined] SSL Key file binary buffer
@@ -322,7 +306,7 @@ MongoClient.prototype.isConnected = function(options) {
  * @param {object} [options.pkFactory] A primary key factory object for generation of custom _id keys
  * @param {object} [options.promiseLibrary] A Promise library class the application wishes to use such as Bluebird, must be ES6 compatible
  * @param {object} [options.readConcern] Specify a read concern for the collection (only MongoDB 3.2 or higher supported)
- * @param {string} [options.readConcern.level='local'] Specify a read concern level for the collection operations, one of [local|majority]. (only MongoDB 3.2 or higher supported)
+ * @param {ReadConcernLevel} [options.readConcern.level='local'] Specify a read concern level for the collection operations (only MongoDB 3.2 or higher supported)
  * @param {number} [options.maxStalenessSeconds=undefined] The max staleness to secondary reads (values under 10 seconds cannot be guaranteed)
  * @param {string} [options.loggerLevel=undefined] The logging level (error/warn/info/debug)
  * @param {object} [options.logger=undefined] Custom logger object

package/lib/operations/aggregate.js

@@ -25,13 +25,13 @@ function aggregate(db, coll, pipeline, options, callback) {
   const isDbAggregate = typeof coll === 'string';
   const target = isDbAggregate ? db : coll;
   const topology = target.s.topology;
-  let ignoreReadConcern = false;
+  let hasOutStage = false;
 
   if (typeof options.out === 'string') {
     pipeline = pipeline.concat({ $out: options.out });
-    ignoreReadConcern = true;
+    hasOutStage = true;
   } else if (pipeline.length > 0 && pipeline[pipeline.length - 1]['$out']) {
-    ignoreReadConcern = true;
+    hasOutStage = true;
   }
 
   let command;
@@ -52,7 +52,7 @@ function aggregate(db, coll, pipeline, options, callback) {
 
   const takesWriteConcern = topology.capabilities().commandsTakeWriteConcern;
 
-  if (!ignoreReadConcern) {
+  if (!hasOutStage) {
     decorateWithReadConcern(command, target, options);
   }
 
@@ -96,7 +96,7 @@ function aggregate(db, coll, pipeline, options, callback) {
   }
 
   options.cursor = options.cursor || {};
-  if (options.batchSize) options.cursor.batchSize = options.batchSize;
+  if (options.batchSize && !hasOutStage) options.cursor.batchSize = options.batchSize;
   command.cursor = options.cursor;
 
   // promiseLibrary

package/lib/operations/collection_ops.js

@@ -81,7 +81,7 @@ const groupFunction =
  * @param {Collection~bulkWriteOpCallback} [callback] The command result callback
  */
 function bulkWrite(coll, operations, options, callback) {
-  // Add ignoreUndfined
+  // Add ignoreUndefined
   if (coll.s.options.ignoreUndefined) {
     options = Object.assign({}, options);
     options.ignoreUndefined = coll.s.options.ignoreUndefined;
@@ -225,7 +225,7 @@ function countDocuments(coll, query, options, callback) {
     pipeline.push({ $limit: limit });
   }
 
-  pipeline.push({ $group: { _id: null, n: { $sum: 1 } } });
+  pipeline.push({ $group: { _id: 1, n: { $sum: 1 } } });
 
   delete options.limit;
   delete options.skip;
@@ -892,6 +892,57 @@ function insertOne(coll, doc, options, callback) {
   });
 }
 
+/**
+ * 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
+ * can be overridden by setting the **forceServerObjectId** flag.
+ *
+ * @method
+ * @param {Collection} a Collection instance.
+ * @param {object[]} docs Documents to insert.
+ * @param {number} [options] Optional settings. See Collection.prototype.insertMany for a list of options.
+ * @param {Collection~insertWriteOpCallback} [callback] The command result callback
+ */
+function insertMany(coll, docs, options, callback) {
+  if (!Array.isArray(docs)) {
+    return callback(
+      MongoError.create({ message: 'docs parameter must be an array of documents', driver: true })
+    );
+  }
+
+  // If keep going set unordered
+  options['serializeFunctions'] = options['serializeFunctions'] || coll.s.serializeFunctions;
+
+  docs = prepareDocs(coll, docs, options);
+
+  // Generate the bulk write operations
+  const operations = [
+    {
+      insertMany: docs
+    }
+  ];
+
+  bulkWrite(coll, operations, options, (err, result) => {
+    if (err) return callback(err, null);
+    callback(null, mapInsertManyResults(docs, result));
+  });
+}
+
+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;
+}
+
 /**
  * Determine whether the collection is a capped collection.
  *
@@ -1476,6 +1527,7 @@ module.exports = {
   indexes,
   indexExists,
   indexInformation,
+  insertMany,
   insertOne,
   isCapped,
   mapReduce,

package/lib/operations/db_ops.js

@@ -97,10 +97,10 @@ function addUser(db, username, password, options, callback) {
       const userPassword = md5.digest('hex');
 
       // If we have another db set
-      const db = options.dbName ? new Db(options.dbName, db.s.topology, db.s.options) : db;
+      const dbToUse = options.dbName ? new Db(options.dbName, db.s.topology, db.s.options) : db;
 
       // Fetch a user collection
-      const collection = db.collection(CONSTANTS.SYSTEM_USER_COLLECTION);
+      const collection = dbToUse.collection(CONSTANTS.SYSTEM_USER_COLLECTION);
 
       // Check if we are inserting the first user
       count(collection, {}, finalOptions, (err, count) => {
@@ -601,7 +601,7 @@ function listCollectionsTransforms(databaseName) {
 }
 
 /**
- * Retrive the current profiling information for MongoDB
+ * Retrieve the current profiling information for MongoDB
  *
  * @method
  * @param {Db} db The Db instance on which to retrieve the profiling info.

package/lib/operations/mongo_client_ops.js

@@ -111,7 +111,8 @@ const validOptionNames = [
   'retryWrites',
   'useNewUrlParser',
   'useUnifiedTopology',
-  'serverSelectionTimeoutMS'
+  'serverSelectionTimeoutMS',
+  'useRecoveryToken'
 ];
 
 function addListeners(mongoClient, topology) {
@@ -593,10 +594,12 @@ function validOptions(options) {
       continue;
     }
 
-    if (_validOptions.indexOf(name) === -1 && options.validateOptions) {
-      return new MongoError(`option ${name} is not supported`);
-    } else if (_validOptions.indexOf(name) === -1) {
-      console.warn(`the options [${name}] is not supported`);
+    if (_validOptions.indexOf(name) === -1) {
+      if (options.validateOptions) {
+        return new MongoError(`option ${name} is not supported`);
+      } else {
+        console.warn(`the options [${name}] is not supported`);
+      }
     }
 
     if (legacyOptionNames.indexOf(name) !== -1) {
@@ -631,7 +634,7 @@ function generateCredentials(client, username, password, options) {
   options = Object.assign({}, options);
 
   // the default db to authenticate against is 'self'
-  // if authententicate is called from a retry context, it may be another one, like admin
+  // if authenticate is called from a retry context, it may be another one, like admin
   const source = options.authSource || options.authdb || options.dbName;
 
   // authMechanism
@@ -663,4 +666,23 @@ function generateCredentials(client, username, password, options) {
   });
 }
 
-module.exports = { connectOp, validOptions };
+function closeOperation(client, force, callback) {
+  const completeClose = err => {
+    client.emit('close', client);
+    for (const name in client.s.dbCache) {
+      client.s.dbCache[name].emit('close', client);
+    }
+
+    client.removeAllListeners('close');
+    callback(err, null);
+  };
+
+  if (client.topology == null) {
+    completeClose();
+    return;
+  }
+
+  client.topology.close(force, completeClose);
+}
+
+module.exports = { connectOp, validOptions, closeOperation };

package/lib/topologies/mongos.js

@@ -70,7 +70,7 @@ var legalOptionNames = [
  * @param {number} [options.acceptableLatencyMS=15] Cutoff latency point in MS for MongoS proxy selection
  * @param {boolean} [options.ssl=false] Use ssl connection (needs to have a mongod server with ssl support)
  * @param {boolean|function} [options.checkServerIdentity=true] Ensure we check server identify during SSL, set to false to disable checking. Only works for Node 0.12.x or higher. You can pass in a boolean or your own checkServerIdentity override function.
- * @param {boolean} [options.sslValidate=true] Validate mongod server certificate against ca (needs to have a mongod server with ssl support, 2.4 or higher)
+ * @param {boolean} [options.sslValidate=false] Validate mongod server certificate against ca (needs to have a mongod server with ssl support, 2.4 or higher)
  * @param {array} [options.sslCA] Array of valid certificates either as Buffers or Strings (needs to have a mongod server with ssl support, 2.4 or higher)
  * @param {array} [options.sslCRL] Array of revocation certificates either as Buffers or Strings (needs to have a mongod server with ssl support, 2.4 or higher)
  * @param {string} [options.ciphers] Passed directly through to tls.createSecureContext. See https://nodejs.org/dist/latest-v9.x/docs/api/tls.html#tls_tls_createsecurecontext_options for more info.

package/lib/topologies/replset.js

@@ -80,7 +80,7 @@ var legalOptionNames = [
  * @param {number} [options.poolSize=5] Number of connections in the connection pool for each server instance, set to 5 as default for legacy reasons.
  * @param {boolean} [options.ssl=false] Use ssl connection (needs to have a mongod server with ssl support)
  * @param {boolean|function} [options.checkServerIdentity=true] Ensure we check server identify during SSL, set to false to disable checking. Only works for Node 0.12.x or higher. You can pass in a boolean or your own checkServerIdentity override function.
- * @param {boolean} [options.sslValidate=true] Validate mongod server certificate against ca (needs to have a mongod server with ssl support, 2.4 or higher)
+ * @param {boolean} [options.sslValidate=false] Validate mongod server certificate against ca (needs to have a mongod server with ssl support, 2.4 or higher)
  * @param {array} [options.sslCA] Array of valid certificates either as Buffers or Strings (needs to have a mongod server with ssl support, 2.4 or higher)
  * @param {array} [options.sslCRL] Array of revocation certificates either as Buffers or Strings (needs to have a mongod server with ssl support, 2.4 or higher)
  * @param {(Buffer|string)} [options.sslCert] String or buffer containing the certificate we wish to present (needs to have a mongod server with ssl support, 2.4 or higher.
@@ -381,10 +381,9 @@ class ReplSet extends TopologyBase {
     self.s.coreTopology.connect(_options);
   }
 
-  close(forceClosed) {
-    super.close(forceClosed);
-
+  close(forceClosed, callback) {
     ['timeout', 'error', 'close', 'joined', 'left'].forEach(e => this.removeAllListeners(e));
+    super.close(forceClosed, callback);
   }
 }
 

package/lib/topologies/server.js

@@ -70,7 +70,7 @@ var legalOptionNames = [
  * @param {object} [options] Optional settings.
  * @param {number} [options.poolSize=5] Number of connections in the connection pool for each server instance, set to 5 as default for legacy reasons.
  * @param {boolean} [options.ssl=false] Use ssl connection (needs to have a mongod server with ssl support)
- * @param {boolean} [options.sslValidate=true] Validate mongod server certificate against ca (needs to have a mongod server with ssl support, 2.4 or higher)
+ * @param {boolean} [options.sslValidate=false] Validate mongod server certificate against ca (needs to have a mongod server with ssl support, 2.4 or higher)
  * @param {boolean|function} [options.checkServerIdentity=true] Ensure we check server identify during SSL, set to false to disable checking. Only works for Node 0.12.x or higher. You can pass in a boolean or your own checkServerIdentity override function.
  * @param {array} [options.sslCA] Array of valid certificates either as Buffers or Strings (needs to have a mongod server with ssl support, 2.4 or higher)
  * @param {array} [options.sslCRL] Array of revocation certificates either as Buffers or Strings (needs to have a mongod server with ssl support, 2.4 or higher)

package/lib/topologies/topology_base.js

@@ -379,7 +379,7 @@ class TopologyBase extends EventEmitter {
     return this.s.coreTopology.connections();
   }
 
-  close(forceClosed) {
+  close(forceClosed, callback) {
     // If we have sessions, we want to individually move them to the session pool,
     // and then send a single endSessions call.
     if (this.s.sessions.length) {
@@ -390,15 +390,18 @@ class TopologyBase extends EventEmitter {
       this.s.sessionPool.endAllPooledSessions();
     }
 
-    this.s.coreTopology.destroy({
-      force: typeof forceClosed === 'boolean' ? forceClosed : false
-    });
-
     // We need to wash out all stored processes
     if (forceClosed === true) {
       this.s.storeOptions.force = forceClosed;
       this.s.store.flush();
     }
+
+    this.s.coreTopology.destroy(
+      {
+        force: typeof forceClosed === 'boolean' ? forceClosed : false
+      },
+      callback
+    );
   }
 }
 

package/lib/url_parser.js

@@ -355,7 +355,7 @@ function parseConnectionString(url, options) {
           if (_host.indexOf('?') !== -1) _host = _host.split(/\?/)[0];
         }
 
-        // No entry returned for duplicate servr
+        // No entry returned for duplicate server
         if (deduplicatedServers[_host + '_' + _port]) return null;
         deduplicatedServers[_host + '_' + _port] = 1;
 

package/lib/utils.js

@@ -114,7 +114,7 @@ var checkCollectionName = function checkCollectionName(collectionName) {
     throw new MongoError("collection names must not start or end with '.'");
   }
 
-  // Validate that we are not passing 0x00 in the colletion name
+  // Validate that we are not passing 0x00 in the collection name
   if (collectionName.indexOf('\x00') !== -1) {
     throw new MongoError('collection names cannot contain a null character');
   }
@@ -360,7 +360,6 @@ var mergeOptionsAndWriteConcern = function(targetOptions, sourceOptions, keys, m
  * @param {function} operation The operation to execute
  * @param {array} args Arguments to apply the provided operation
  * @param {object} [options] Options that modify the behavior of the method
- * @param {function]} [options.resultMutator] Allows for the result of the operation to be changed for custom return types
  */
 const executeOperation = (topology, operation, args, options) => {
   if (topology == null) {
@@ -373,7 +372,6 @@ const executeOperation = (topology, operation, args, options) => {
 
   options = options || {};
   const Promise = topology.s.promiseLibrary;
-  let resultMutator = options.resultMutator;
   let callback = args[args.length - 1];
 
   // The driver sessions spec mandates that we implicitly create sessions for operations
@@ -397,12 +395,10 @@ const executeOperation = (topology, operation, args, options) => {
         session.endSession(() => {
           delete opOptions.session;
           if (err) return reject(err);
-          if (resultMutator) return resolve(resultMutator(result));
           resolve(result);
         });
       } else {
         if (err) return reject(err);
-        if (resultMutator) return resolve(resultMutator(result));
         resolve(result);
       }
     };
@@ -694,6 +690,15 @@ function deprecateOptions(config, fn) {
   return deprecated;
 }
 
+const SUPPORTS = {};
+// Test asyncIterator support
+try {
+  require('./async/async_iterator');
+  SUPPORTS.ASYNC_ITERATOR = true;
+} catch (e) {
+  SUPPORTS.ASYNC_ITERATOR = false;
+}
+
 module.exports = {
   filterOptions,
   mergeOptions,
@@ -719,5 +724,6 @@ module.exports = {
   isPromiseLike,
   decorateWithCollation,
   decorateWithReadConcern,
-  deprecateOptions
+  deprecateOptions,
+  SUPPORTS
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mongodb",
-  "version": "3.2.0-beta1",
+  "version": "3.2.3",
   "description": "The official MongoDB driver for Node.js",
   "main": "index.js",
   "files": [
@@ -17,7 +17,7 @@
     "official"
   ],
   "dependencies": {
-    "mongodb-core": "3.2.0-beta1",
+    "mongodb-core": "^3.2.3",
     "safe-buffer": "^5.1.2"
   },
   "devDependencies": {