mongodb 3.2.1 → 3.2.5

package/HISTORY.md

@@ -2,6 +2,72 @@
 
 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.5"></a>
+## [3.2.5](https://github.com/mongodb/node-mongodb-native/compare/v3.2.4...v3.2.5) (2019-05-17)
+
+
+### Bug Fixes
+
+* **core:** updating core to 3.2.5 ([a2766c1](https://github.com/mongodb/node-mongodb-native/commit/a2766c1))
+
+
+
+<a name="3.2.4"></a>
+## [3.2.4](https://github.com/mongodb/node-mongodb-native/compare/v3.2.2...v3.2.4) (2019-05-08)
+
+
+### 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))
+* **BulkOp:** run unordered bulk ops in serial ([f548bd7](https://github.com/mongodb/node-mongodb-native/commit/f548bd7))
+* **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))
+* **gridfs-stream:** honor chunk size ([9eeb114](https://github.com/mongodb/node-mongodb-native/commit/9eeb114))
+* **unified-topology:** only clone pool size if provided ([8dc2416](https://github.com/mongodb/node-mongodb-native/commit/8dc2416))
+
+
+### Features
+
+* update to mongodb-core v3.2.3 ([1c5357a](https://github.com/mongodb/node-mongodb-native/commit/1c5357a))
+* **core:** update to mongodb-core v3.2.4 ([2059260](https://github.com/mongodb/node-mongodb-native/commit/2059260))
+* **lib:** implement executeOperationV2 ([67d4edf](https://github.com/mongodb/node-mongodb-native/commit/67d4edf))
+
+
+
+<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)
 

package/README.md

@@ -31,10 +31,9 @@ case in our issue management tool, JIRA:
 Bug reports in JIRA for all driver projects (i.e. NODE, PYTHON, CSHARP, JAVA) and the
 Core Server (i.e. SERVER) project are **public**.
 
-### Questions and Bug Reports
+### Support / Feedback
 
- * Mailing List: [groups.google.com/forum/#!forum/node-mongodb-native](https://groups.google.com/forum/#!forum/node-mongodb-native)
- * JIRA: [jira.mongodb.org](http://jira.mongodb.org)
+For issues with, questions about, or feedback for the Node.js driver, please look into our [support channels](http://www.mongodb.org/about/support). Please do not email any of the driver developers directly with issues or questions - you're more likely to get an answer on the [mongodb-user](http://groups.google.com/group/mongodb-user>) list on Google Groups.
 
 ### Change Log
 

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,7 +131,7 @@ inherits(AggregationCursor, Readable);
 for (var name in CoreCursor.prototype) {
   AggregationCursor.prototype[name] = CoreCursor.prototype[name];
 }
-if (Symbol.asyncIterator) {
+if (SUPPORTS.ASYNC_ITERATOR) {
   AggregationCursor.prototype[
     Symbol.asyncIterator
   ] = require('./async/async_iterator').asyncIterator;
@@ -147,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;
@@ -325,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.
@@ -342,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/async_iterator.js

@@ -1,15 +1,33 @@
 'use strict';
 
-async function* asyncIterator() {
-  while (true) {
-    const value = await this.next();
-    if (!value) {
-      await this.close();
-      return;
-    }
+// async function* asyncIterator() {
+//   while (true) {
+//     const value = await this.next();
+//     if (!value) {
+//       await this.close();
+//       return;
+//     }
+
+//     yield value;
+//   }
+// }
 
-    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

@@ -2,18 +2,18 @@
 
 const Long = require('mongodb-core').BSON.Long;
 const MongoError = require('mongodb-core').MongoError;
+const ObjectID = require('mongodb-core').BSON.ObjectID;
+const BSON = require('mongodb-core').BSON;
+const MongoWriteConcernError = require('mongodb-core').MongoWriteConcernError;
 const toError = require('../utils').toError;
 const handleCallback = require('../utils').handleCallback;
 const applyRetryableWrites = require('../utils').applyRetryableWrites;
 const applyWriteConcern = require('../utils').applyWriteConcern;
-const ObjectID = require('mongodb-core').BSON.ObjectID;
-const BSON = require('mongodb-core').BSON;
+const executeOperation = require('../utils').executeOperation;
+const isPromiseLike = require('../utils').isPromiseLike;
 
 // Error codes
-const UNKNOWN_ERROR = 8;
-const INVALID_BSON_ERROR = 22;
 const WRITE_CONCERN_ERROR = 64;
-const MULTIPLE_ERROR = 65;
 
 // Insert types
 const INSERT = 1;
@@ -54,18 +54,6 @@ class Batch {
   }
 }
 
-/**
- * Wraps a legacy operation so we can correctly rewrite it's error
- * @ignore
- */
-class LegacyOp {
-  constructor(batchType, operation, index) {
-    this.batchType = batchType;
-    this.index = index;
-    this.operation = operation;
-  }
-}
-
 /**
  * Create a new BulkWriteResult instance (INTERNAL TYPE, do not instantiate directly)
  *
@@ -352,7 +340,7 @@ class WriteError {
  * Merges results into shared data structure
  * @ignore
  */
-function mergeBatchResults(ordered, batch, bulkResult, err, result) {
+function mergeBatchResults(batch, bulkResult, err, result) {
   // If we have an error set the result to be the err object
   if (err) {
     result = err;
@@ -484,6 +472,41 @@ function mergeBatchResults(ordered, batch, bulkResult, err, result) {
   }
 }
 
+function executeCommands(bulkOperation, options, callback) {
+  if (bulkOperation.s.batches.length === 0) {
+    return handleCallback(callback, null, new BulkWriteResult(bulkOperation.s.bulkResult));
+  }
+
+  const batch = bulkOperation.s.batches.shift();
+
+  function resultHandler(err, result) {
+    // Error is a driver related error not a bulk op error, terminate
+    if (((err && err.driver) || (err && err.message)) && !(err instanceof MongoWriteConcernError)) {
+      return handleCallback(callback, err);
+    }
+
+    // If we have and error
+    if (err) err.ok = 0;
+    if (err instanceof MongoWriteConcernError) {
+      return handleMongoWriteConcernError(batch, bulkOperation.s.bulkResult, err, callback);
+    }
+
+    // Merge the results together
+    const writeResult = new BulkWriteResult(bulkOperation.s.bulkResult);
+    const mergeResult = mergeBatchResults(batch, bulkOperation.s.bulkResult, err, result);
+    if (mergeResult != null) {
+      return handleCallback(callback, null, writeResult);
+    }
+
+    if (bulkOperation.handleWriteError(callback, writeResult)) return;
+
+    // Execute the next command in line
+    executeCommands(bulkOperation, options, callback);
+  }
+
+  bulkOperation.finalOptionsHandler({ options, batch, resultHandler }, callback);
+}
+
 /**
  * handles write concern error
  *
@@ -493,8 +516,8 @@ function mergeBatchResults(ordered, batch, bulkResult, err, result) {
  * @param {WriteConcernError} err
  * @param {function} callback
  */
-function handleMongoWriteConcernError(batch, bulkResult, ordered, err, callback) {
-  mergeBatchResults(ordered, batch, bulkResult, null, err.result);
+function handleMongoWriteConcernError(batch, bulkResult, err, callback) {
+  mergeBatchResults(batch, bulkResult, null, err.result);
 
   const wrappedWriteConcernError = new WriteConcernError({
     errmsg: err.result.writeConcernError.errmsg,
@@ -906,6 +929,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 +951,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,13 +973,43 @@ 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 };
   }
 
+  /**
+   * The callback format for results
+   * @callback BulkOperationBase~resultCallback
+   * @param {MongoError} error An error instance representing the error during the execution.
+   * @param {BulkWriteResult} result The bulk write result.
+   */
+  /**
+   * Execute the ordered bulk operation
+   *
+   * @method
+   * @param {object} [options] Optional settings.
+   * @param {(number|string)} [options.w] The write concern.
+   * @param {number} [options.wtimeout] The write concern timeout.
+   * @param {boolean} [options.j=false] Specify a journal write concern.
+   * @param {boolean} [options.fsync=false] Specify a file sync write concern.
+   * @param {BulkOperationBase~resultCallback} [callback] The result callback
+   * @throws {MongoError} Throws error if the bulk object has already been executed
+   * @throws {MongoError} Throws error if the bulk object does not have any operations
+   * @return {Promise} returns Promise if no callback passed
+   */
+  execute(_writeConcern, options, callback) {
+    const ret = this.bulkExecute(_writeConcern, options, callback);
+    if (!ret || isPromiseLike(ret)) {
+      return ret;
+    }
+
+    options = ret.options;
+    callback = ret.callback;
+
+    return executeOperation(this.s.topology, executeCommands, [this, options, callback]);
+  }
+
   /**
    * Handles final options before executing command
    *
@@ -1033,11 +1093,7 @@ class BulkOperationBase {
       // Force top level error
       err.ok = 0;
       // Merge top level error and return
-      handleCallback(
-        callback,
-        null,
-        mergeBatchResults(false, config.batch, this.s.bulkResult, err, null)
-      );
+      handleCallback(callback, null, mergeBatchResults(config.batch, this.s.bulkResult, err, null));
     }
   }
 
@@ -1094,20 +1150,8 @@ Object.defineProperty(BulkOperationBase.prototype, 'length', {
 module.exports = {
   Batch,
   BulkOperationBase,
-  BulkWriteError,
-  BulkWriteResult,
   bson,
-  FindOperators,
-  handleMongoWriteConcernError,
-  LegacyOp,
-  mergeBatchResults,
-  INVALID_BSON_ERROR: INVALID_BSON_ERROR,
-  MULTIPLE_ERROR: MULTIPLE_ERROR,
-  UNKNOWN_ERROR: UNKNOWN_ERROR,
-  WRITE_CONCERN_ERROR: WRITE_CONCERN_ERROR,
   INSERT: INSERT,
   UPDATE: UPDATE,
-  REMOVE: REMOVE,
-  WriteError,
-  WriteConcernError
+  REMOVE: REMOVE
 };

package/lib/bulk/ordered.js

@@ -2,17 +2,10 @@
 
 const common = require('./common');
 const BulkOperationBase = common.BulkOperationBase;
-const utils = require('../utils');
-const toError = utils.toError;
-const handleCallback = utils.handleCallback;
-const BulkWriteResult = common.BulkWriteResult;
 const Batch = common.Batch;
-const mergeBatchResults = common.mergeBatchResults;
-const executeOperation = utils.executeOperation;
-const MongoWriteConcernError = require('mongodb-core').MongoWriteConcernError;
-const handleMongoWriteConcernError = require('./common').handleMongoWriteConcernError;
 const bson = common.bson;
-const isPromiseLike = require('../utils').isPromiseLike;
+const utils = require('../utils');
+const toError = utils.toError;
 
 /**
  * Add to internal list of Operations
@@ -85,6 +78,7 @@ function addToOperationsList(bulkOperation, docType, document) {
 /**
  * Create a new OrderedBulkOperation instance (INTERNAL TYPE, do not instantiate directly)
  * @class
+ * @extends BulkOperationBase
  * @property {number} length Get the number of operations in the bulk.
  * @return {OrderedBulkOperation} a OrderedBulkOperation instance.
  */
@@ -96,81 +90,6 @@ class OrderedBulkOperation extends BulkOperationBase {
 
     super(topology, collection, options, true);
   }
-
-  /**
-   * The callback format for results
-   * @callback OrderedBulkOperation~resultCallback
-   * @param {MongoError} error An error instance representing the error during the execution.
-   * @param {BulkWriteResult} result The bulk write result.
-   */
-
-  /**
-   * Execute the ordered bulk operation
-   *
-   * @method
-   * @param {object} [options] Optional settings.
-   * @param {(number|string)} [options.w] The write concern.
-   * @param {number} [options.wtimeout] The write concern timeout.
-   * @param {boolean} [options.j=false] Specify a journal write concern.
-   * @param {boolean} [options.fsync=false] Specify a file sync write concern.
-   * @param {OrderedBulkOperation~resultCallback} [callback] The result callback
-   * @throws {MongoError}
-   * @return {Promise} returns Promise if no callback passed
-   */
-  execute(_writeConcern, options, callback) {
-    const ret = this.bulkExecute(_writeConcern, options, callback);
-    if (isPromiseLike(ret)) {
-      return ret;
-    }
-
-    options = ret.options;
-    callback = ret.callback;
-
-    return executeOperation(this.s.topology, executeCommands, [this, options, callback]);
-  }
-}
-
-/**
- * Execute next write command in a chain
- *
- * @param {OrderedBulkOperation} bulkOperation
- * @param {object} options
- * @param {function} callback
- */
-function executeCommands(bulkOperation, options, callback) {
-  if (bulkOperation.s.batches.length === 0) {
-    return handleCallback(callback, null, new BulkWriteResult(bulkOperation.s.bulkResult));
-  }
-
-  // Ordered execution of the command
-  const batch = bulkOperation.s.batches.shift();
-
-  function resultHandler(err, result) {
-    // Error is a driver related error not a bulk op error, terminate
-    if (((err && err.driver) || (err && err.message)) && !(err instanceof MongoWriteConcernError)) {
-      return handleCallback(callback, err);
-    }
-
-    // If we have and error
-    if (err) err.ok = 0;
-    if (err instanceof MongoWriteConcernError) {
-      return handleMongoWriteConcernError(batch, bulkOperation.s.bulkResult, true, err, callback);
-    }
-
-    // Merge the results together
-    const writeResult = new BulkWriteResult(bulkOperation.s.bulkResult);
-    const mergeResult = mergeBatchResults(true, batch, bulkOperation.s.bulkResult, err, result);
-    if (mergeResult != null) {
-      return handleCallback(callback, null, writeResult);
-    }
-
-    if (bulkOperation.handleWriteError(callback, writeResult)) return;
-
-    // Execute the next command in line
-    executeCommands(bulkOperation, options, callback);
-  }
-
-  bulkOperation.finalOptionsHandler({ options, batch, resultHandler }, callback);
 }
 
 /**

package/lib/bulk/unordered.js

@@ -2,17 +2,10 @@
 
 const common = require('./common');
 const BulkOperationBase = common.BulkOperationBase;
-const utils = require('../utils');
-const toError = utils.toError;
-const handleCallback = utils.handleCallback;
-const BulkWriteResult = common.BulkWriteResult;
 const Batch = common.Batch;
-const mergeBatchResults = common.mergeBatchResults;
-const executeOperation = utils.executeOperation;
-const MongoWriteConcernError = require('mongodb-core').MongoWriteConcernError;
-const handleMongoWriteConcernError = require('./common').handleMongoWriteConcernError;
 const bson = common.bson;
-const isPromiseLike = require('../utils').isPromiseLike;
+const utils = require('../utils');
+const toError = utils.toError;
 
 /**
  * Add to internal list of Operations
@@ -98,6 +91,7 @@ function addToOperationsList(bulkOperation, docType, document) {
 /**
  * Create a new UnorderedBulkOperation instance (INTERNAL TYPE, do not instantiate directly)
  * @class
+ * @extends BulkOperationBase
  * @property {number} length Get the number of operations in the bulk.
  * @return {UnorderedBulkOperation} a UnorderedBulkOperation instance.
  */
@@ -108,106 +102,6 @@ class UnorderedBulkOperation extends BulkOperationBase {
 
     super(topology, collection, options, false);
   }
-
-  /**
-   * The callback format for results
-   * @callback UnorderedBulkOperation~resultCallback
-   * @param {MongoError} error An error instance representing the error during the execution.
-   * @param {BulkWriteResult} result The bulk write result.
-   */
-
-  /**
-   * Execute the ordered bulk operation
-   *
-   * @method
-   * @param {object} [options] Optional settings.
-   * @param {(number|string)} [options.w] The write concern.
-   * @param {number} [options.wtimeout] The write concern timeout.
-   * @param {boolean} [options.j=false] Specify a journal write concern.
-   * @param {boolean} [options.fsync=false] Specify a file sync write concern.
-   * @param {UnorderedBulkOperation~resultCallback} [callback] The result callback
-   * @throws {MongoError}
-   * @return {Promise} returns Promise if no callback passed
-   */
-  execute(_writeConcern, options, callback) {
-    const ret = this.bulkExecute(_writeConcern, options, callback);
-    if (isPromiseLike(ret)) {
-      return ret;
-    }
-
-    options = ret.options;
-    callback = ret.callback;
-
-    return executeOperation(this.s.topology, executeBatches, [this, options, callback]);
-  }
-}
-
-/**
- * Execute the command
- *
- * @param {UnorderedBulkOperation} bulkOperation
- * @param {object} batch
- * @param {object} options
- * @param {function} callback
- */
-function executeBatch(bulkOperation, batch, options, callback) {
-  function resultHandler(err, result) {
-    // Error is a driver related error not a bulk op error, terminate
-    if (((err && err.driver) || (err && err.message)) && !(err instanceof MongoWriteConcernError)) {
-      return handleCallback(callback, err);
-    }
-
-    // If we have and error
-    if (err) err.ok = 0;
-    if (err instanceof MongoWriteConcernError) {
-      return handleMongoWriteConcernError(batch, bulkOperation.s.bulkResult, false, err, callback);
-    }
-    handleCallback(
-      callback,
-      null,
-      mergeBatchResults(false, batch, bulkOperation.s.bulkResult, err, result)
-    );
-  }
-
-  bulkOperation.finalOptionsHandler({ options, batch, resultHandler }, callback);
-}
-
-/**
- * Execute all the commands
- *
- * @param {UnorderedBulkOperation} bulkOperation
- * @param {object} options
- * @param {function} callback
- */
-function executeBatches(bulkOperation, options, callback) {
-  let numberOfCommandsToExecute = bulkOperation.s.batches.length;
-  let hasErrored = false;
-  // Execute over all the batches
-  for (let i = 0; i < bulkOperation.s.batches.length; i++) {
-    executeBatch(bulkOperation, bulkOperation.s.batches[i], options, function(err) {
-      if (hasErrored) {
-        return;
-      }
-
-      if (err) {
-        hasErrored = true;
-        return handleCallback(callback, err);
-      }
-      // Count down the number of commands left to execute
-      numberOfCommandsToExecute = numberOfCommandsToExecute - 1;
-
-      // Execute
-      if (numberOfCommandsToExecute === 0) {
-        // Driver level error
-        if (err) return handleCallback(callback, err);
-
-        const writeResult = new BulkWriteResult(bulkOperation.s.bulkResult);
-        if (bulkOperation.handleWriteError(callback, writeResult)) return;
-
-        return handleCallback(callback, null, writeResult);
-      }
-    });
-  }
 }
 
 /**

package/lib/collection.js

@@ -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;
@@ -685,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;
@@ -713,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;
@@ -749,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;
@@ -782,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;
@@ -829,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;
@@ -856,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;
@@ -885,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;
@@ -912,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;
@@ -963,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
@@ -1126,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
  */
@@ -1146,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
  */
@@ -1318,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
@@ -1398,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
@@ -1587,7 +1587,18 @@ Collection.prototype.findOneAndUpdate = function(filter, update, options, callba
  * @return {Promise} returns Promise if no callback passed
  * @deprecated use findOneAndUpdate, findOneAndReplace or findOneAndDelete instead
  */
-Collection.prototype.findAndModify = deprecate(function(query, sort, doc, options, callback) {
+Collection.prototype.findAndModify = deprecate(
+  _findAndModify,
+  'collection.findAndModify is deprecated. Use findOneAndUpdate, findOneAndReplace or findOneAndDelete instead.'
+);
+
+/**
+ * @ignore
+ */
+
+Collection.prototype._findAndModify = _findAndModify;
+
+function _findAndModify(query, sort, doc, options, callback) {
   const args = Array.prototype.slice.call(arguments, 1);
   callback = typeof args[args.length - 1] === 'function' ? args.pop() : undefined;
   sort = args.length ? args.shift() || [] : [];
@@ -1607,7 +1618,7 @@ Collection.prototype.findAndModify = deprecate(function(query, sort, doc, option
     options,
     callback
   ]);
-}, 'collection.findAndModify is deprecated. Use findOneAndUpdate, findOneAndReplace or findOneAndDelete instead.');
+}
 
 /**
  * Find and remove a document.

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,7 +157,7 @@ for (var i = 0; i < methodsToInherit.length; i++) {
   CommandCursor.prototype[methodsToInherit[i]] = CoreCursor.prototype[methodsToInherit[i]];
 }
 
-if (Symbol.asyncIterator) {
+if (SUPPORTS.ASYNC_ITERATOR) {
   CommandCursor.prototype[Symbol.asyncIterator] = require('./async/async_iterator').asyncIterator;
 }
 
@@ -258,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}
@@ -274,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,7 +204,7 @@ function Cursor(bson, ns, cmd, options, topology, topologyOptions) {
 // Inherit from Readable
 inherits(Cursor, Readable);
 
-if (Symbol.asyncIterator) {
+if (SUPPORTS.ASYNC_ITERATOR) {
   Cursor.prototype[Symbol.asyncIterator] = require('./async/async_iterator').asyncIterator;
 }
 
@@ -692,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
@@ -810,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.
@@ -844,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/gridfs-stream/download.js

@@ -234,13 +234,12 @@ function doRead(_this) {
       _this.s.bytesToSkip = 0;
     }
 
-    if (expectedN === _this.s.expectedEnd && _this.s.bytesToTrim != null) {
-      sliceEnd = _this.s.bytesToTrim;
-    }
-
-    // If the remaining amount of data left is < chunkSize read the right amount of data
-    if (_this.s.options.end && _this.s.options.end - _this.s.bytesToSkip < buf.length) {
-      sliceEnd = _this.s.options.end - _this.s.bytesToSkip;
+    const atEndOfStream = expectedN === _this.s.expectedEnd - 1;
+    const bytesLeftToRead = _this.s.options.end - _this.s.bytesToSkip;
+    if (atEndOfStream && _this.s.bytesToTrim != null) {
+      sliceEnd = _this.s.file.chunkSize - _this.s.bytesToTrim;
+    } else if (_this.s.options.end && bytesLeftToRead < doc.data.length()) {
+      sliceEnd = bytesLeftToRead;
     }
 
     if (sliceStart != null || sliceEnd != null) {

package/lib/mongo_client.js

@@ -46,6 +46,12 @@ const closeOperation = require('./operations/mongo_client_ops').closeOperation;
  * });
  */
 
+/**
+ * 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 closeOperation = require('./operations/mongo_client_ops').closeOperation;
  * @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 closeOperation = require('./operations/mongo_client_ops').closeOperation;
  * @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
@@ -179,7 +185,7 @@ MongoClient.prototype.logout = deprecate(function(options, callback) {
 /**
  * Close the db and its underlying connections
  * @method
- * @param {boolean} force Force close, emitting no events
+ * @param {boolean} [force=false] Force close, emitting no events
  * @param {Db~noResultCallback} [callback] The result callback
  * @return {Promise} returns Promise if no callback passed
  */
@@ -265,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
@@ -300,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/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;

package/lib/operations/db_ops.js

@@ -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

@@ -634,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

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/native_topology.js

@@ -14,9 +14,10 @@ class NativeTopology extends Topology {
       {
         cursorFactory: Cursor,
         reconnect: false,
-        emitError: options.emitError,
-        size: options.poolSize,
-        monitorCommands: options.monitorCommands
+        emitError: typeof options.emitError === 'boolean' ? options.emitError : true,
+        size: typeof options.poolSize === 'number' ? options.poolSize : 5,
+        monitorCommands:
+          typeof options.monitorCommands === 'boolean' ? options.monitorCommands : false
       }
     );
 

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.

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/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');
   }
@@ -690,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,
@@ -715,5 +724,6 @@ module.exports = {
   isPromiseLike,
   decorateWithCollation,
   decorateWithReadConcern,
-  deprecateOptions
+  deprecateOptions,
+  SUPPORTS
 };

package/package.json

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