mongodb 2.2.29 → 2.2.33

package/HISTORY.md

@@ -1,3 +1,30 @@
+2.2.33 2017-10-12
+-----------------
+* update to mongodb-core 2.1.17
+
+2.2.32 2017-10-11
+-----------------
+* update to mongodb-core 2.1.16
+* ensure that the `cursor` key is always present in aggregation commands
+* `Cursor.prototype.hasNext` now propagates errors when using callback
+* allow passing `noCursorTimeout` as an option to `find()`
+* bubble up `reconnectFailed` event from Server topology
+
+2.2.31 2017-08-08
+-----------------
+* update mongodb-core to 2.1.15
+* allow auth option in MongoClient.connect
+* remove duplicate option `promoteLongs` from MongoClient's `connect`
+* bulk operations should not throw an error on empty batch
+
+2.2.30 2017-07-07
+-----------------
+* Update mongodb-core to 2.1.14
+* MongoClient
+  * add `appname` to list of valid option names
+  * added test for passing appname as option
+* NODE-1052 ensure user options are applied while parsing connection string uris
+
 2.2.29 2017-06-19
 -----------------
 * Update mongodb-core to 2.1.13

package/lib/admin.js

@@ -248,7 +248,7 @@ Admin.prototype.authenticate = function(username, password, options, callback) {
   var finalArguments = [this.s.db];
   if(typeof username == 'string') finalArguments.push(username);
   if(typeof password == 'string') finalArguments.push(password);
-  if(typeof options == 'function') { 
+  if(typeof options == 'function') {
     finalArguments.push({ authdb: 'admin' });
     finalArguments.push(options);
   } else {
@@ -256,7 +256,7 @@ Admin.prototype.authenticate = function(username, password, options, callback) {
   }
 
   if(typeof callback == 'function') finalArguments.push(callback);
-  // Excute authenticate method
+  // Execute authenticate method
   return authenticate.apply(this.s.db, finalArguments);
 }
 
@@ -435,7 +435,7 @@ var setProfilingLevel = function(self, level, callback) {
 define.classMethod('setProfilingLevel', {callback: true, promise:true});
 
 /**
- * Retrive the current profiling information for MongoDB
+ * Retrieve the current profiling information for MongoDB
  *
  * @param {Admin~resultCallback} [callback] The command result callback.
  * @return {Promise} returns Promise if no callback passed

package/lib/aggregation_cursor.js

@@ -144,7 +144,7 @@ var define = AggregationCursor.define = new Define('AggregationCursor', Aggregat
  */
 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 });
+  if(typeof value != 'number') 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;
@@ -350,7 +350,7 @@ define.classMethod('readBufferedDocuments', {callback: false, promise:false, ret
 /**
  * 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.
@@ -367,7 +367,7 @@ define.classMethod('readBufferedDocuments', {callback: false, promise:false, ret
 
 /**
  * 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/apm.js

@@ -96,7 +96,7 @@ var Instrumentation = function(core, options, callback) {
     // The actual prototype
     proto[x] = function() {
       var requestId = core.Query.nextRequestId();
-      // Get the aruments
+      // Get the arguments
       var args = Array.prototype.slice.call(arguments, 0);
       var ns = args[0];
       var commandObj = args[1];
@@ -261,7 +261,7 @@ var Instrumentation = function(core, options, callback) {
 
       // The actual prototype
       proto[x] = function() {
-        // Get the aruments
+        // Get the arguments
         var args = Array.prototype.slice.call(arguments, 0);
         // Set an operation Id on the bulk object
         this.operationId = operationIdGenerator.next();
@@ -435,7 +435,7 @@ var Instrumentation = function(core, options, callback) {
           connectionId: connectionId
         };
 
-        // Get the aruments
+        // Get the arguments
         var args = Array.prototype.slice.call(arguments, 0);
 
         // Get the callback
@@ -493,7 +493,7 @@ var Instrumentation = function(core, options, callback) {
                     nextBatch: cursor.cursorState.documents
                   }, ok:1
                 }
-              } else if((commandName.toLowerCase() == 'find' 
+              } else if((commandName.toLowerCase() == 'find'
                 || commandName.toLowerCase() == 'aggregate'
                 || commandName.toLowerCase() == 'listcollections') && r == null) {
                 r = {

package/lib/authenticate.js

@@ -7,7 +7,7 @@ var authenticate = function(self, username, password, options, callback) {
   if(self.serverConfig && self.serverConfig.isDestroyed()) return callback(new MongoError('topology was destroyed'));
 
   // 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
   var authdb = options.dbName ? options.dbName : self.databaseName;
   authdb = self.authSource ? self.authSource : authdb;
   authdb = options.authdb ? options.authdb : authdb;

package/lib/bulk/common.js

@@ -151,6 +151,7 @@ var BulkWriteResult = function(bulkResult) {
   /**
    * Returns a specific write error object
    *
+   * @param {number} index of the write error to return, returns null if there is no result for passed in index
    * @return {WriteError}
    */
   this.getWriteErrorAt = function(index) {

package/lib/bulk/ordered.js

@@ -488,30 +488,37 @@ var executeCommands = function(self, callback) {
  */
 OrderedBulkOperation.prototype.execute = function(_writeConcern, callback) {
   var self = this;
-  if(this.s.executed) throw new toError("batch cannot be re-executed");
-  if(typeof _writeConcern == 'function') {
+  if (this.s.executed) {
+    var 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') {
+  } else if (_writeConcern && typeof _writeConcern === 'object') {
     this.s.writeConcern = _writeConcern;
   }
 
   // If we have current batch
-  if(this.s.currentBatch) this.s.batches.push(this.s.currentBatch)
+  if (this.s.currentBatch) this.s.batches.push(this.s.currentBatch)
 
   // If we have no operations in the bulk raise an error
-  if(this.s.batches.length == 0) {
-    throw toError("Invalid Operation, No operations in bulk");
+  if (this.s.batches.length == 0) {
+    var emptyBatchError = toError('Invalid Operation, no operations specified');
+    return (typeof callback === 'function') ?
+      callback(emptyBatchError, null) : this.s.promiseLibrary.reject(emptyBatchError);
   }
 
   // Execute using callback
-  if(typeof callback == 'function') {
-		return executeCommands(this, callback);
-	}
+  if (typeof callback === 'function') {
+    return executeCommands(this, callback);
+  }
 
   // Return a Promise
   return new this.s.promiseLibrary(function(resolve, reject) {
     executeCommands(self, function(err, r) {
-      if(err) return reject(err);
+      if (err) return reject(err);
       resolve(r);
     });
   });

package/lib/bulk/unordered.js

@@ -213,7 +213,7 @@ var addToOperationsList = function(_self, docType, document) {
 var UnorderedBulkOperation = function(topology, collection, options) {
 	options = options == null ? {} : options;
 
-	// Get the namesspace for the write operations
+	// Get the namespace for the write operations
   var namespace = collection.collectionName;
   // Used to mark operation as executed
   var executed = false;
@@ -490,30 +490,37 @@ var executeBatches = function(self, callback) {
  */
 UnorderedBulkOperation.prototype.execute = function(_writeConcern, callback) {
   var self = this;
-  if(this.s.executed) throw toError("batch cannot be re-executed");
-  if(typeof _writeConcern == 'function') {
+  if (this.s.executed) {
+    var 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') {
+  } else if (_writeConcern && typeof _writeConcern === 'object') {
     this.s.writeConcern = _writeConcern;
   }
 
   // If we have current batch
-  if(this.s.currentInsertBatch) this.s.batches.push(this.s.currentInsertBatch);
-  if(this.s.currentUpdateBatch) this.s.batches.push(this.s.currentUpdateBatch);
-  if(this.s.currentRemoveBatch) this.s.batches.push(this.s.currentRemoveBatch);
+  if (this.s.currentInsertBatch) this.s.batches.push(this.s.currentInsertBatch);
+  if (this.s.currentUpdateBatch) this.s.batches.push(this.s.currentUpdateBatch);
+  if (this.s.currentRemoveBatch) this.s.batches.push(this.s.currentRemoveBatch);
 
   // If we have no operations in the bulk raise an error
-  if(this.s.batches.length == 0) {
-    throw toError("Invalid Operation, No operations in bulk");
+  if (this.s.batches.length == 0) {
+    var emptyBatchError = toError('Invalid Operation, no operations specified');
+    return (typeof callback === 'function') ?
+      callback(emptyBatchError, null) : this.s.promiseLibrary.reject(emptyBatchError);
   }
 
   // Execute using callback
-  if(typeof callback == 'function') return executeBatches(this, callback);
+  if (typeof callback === 'function') return executeBatches(this, callback);
 
   // Return a Promise
   return new this.s.promiseLibrary(function(resolve, reject) {
     executeBatches(self, function(err, r) {
-      if(err) return reject(err);
+      if (err) return reject(err);
       resolve(r);
     });
   });

package/lib/collection.js

@@ -21,8 +21,7 @@ var checkCollectionName = require('./utils').checkCollectionName
   , Cursor = require('./cursor')
   , unordered = require('./bulk/unordered')
   , ordered = require('./bulk/ordered')
-  , assign = require('./utils').assign
-  , mergeOptions = require('./utils').mergeOptions;
+  , assign = require('./utils').assign;
 
 /**
  * @fileOverview The **Collection** class is an internal class that embodies a MongoDB collection
@@ -417,7 +416,7 @@ Collection.prototype.insertOne = function(doc, options, callback) {
     });
   }
 
-  // Add ignoreUndfined
+  // Add ignoreUndefined
   if(this.s.options.ignoreUndefined) {
     options = shallowClone(options);
     options.ignoreUndefined = this.s.options.ignoreUndefined;
@@ -448,7 +447,7 @@ var insertOne = function(self, doc, options, callback) {
   });
 }
 
-var mapInserManyResults = function(docs, r) {
+var mapInsertManyResults = function(docs, r) {
   var ids = r.getInsertedIds();
   var keys = Object.keys(ids);
   var finalIds = new Array(keys.length);
@@ -533,14 +532,14 @@ Collection.prototype.insertMany = function(docs, options, callback) {
   // Execute using callback
   if(typeof callback == 'function') return bulkWrite(self, operations, options, function(err, r) {
     if(err) return callback(err, r);
-    callback(null, mapInserManyResults(docs, r));
+    callback(null, mapInsertManyResults(docs, r));
   });
 
   // Return a Promise
   return new this.s.promiseLibrary(function(resolve, reject) {
     bulkWrite(self, operations, options, function(err, r) {
       if(err) return reject(err);
-      resolve(mapInserManyResults(docs, r));
+      resolve(mapInsertManyResults(docs, r));
     });
   });
 }
@@ -621,7 +620,7 @@ Collection.prototype.bulkWrite = function(operations, options, callback) {
 }
 
 var bulkWrite = function(self, operations, options, callback) {
-  // Add ignoreUndfined
+  // Add ignoreUndefined
   if(self.s.options.ignoreUndefined) {
     options = shallowClone(options);
     options.ignoreUndefined = self.s.options.ignoreUndefined;
@@ -878,7 +877,7 @@ Collection.prototype.updateOne = function(filter, update, options, callback) {
   if(typeof options == 'function') callback = options, options = {};
   options = shallowClone(options)
 
-  // Add ignoreUndfined
+  // Add ignoreUndefined
   if(this.s.options.ignoreUndefined) {
     options = shallowClone(options);
     options.ignoreUndefined = this.s.options.ignoreUndefined;
@@ -933,7 +932,7 @@ Collection.prototype.replaceOne = function(filter, doc, options, callback) {
   if(typeof options == 'function') callback = options, options = {};
   options = shallowClone(options)
 
-  // Add ignoreUndfined
+  // Add ignoreUndefined
   if(this.s.options.ignoreUndefined) {
     options = shallowClone(options);
     options.ignoreUndefined = this.s.options.ignoreUndefined;
@@ -990,7 +989,7 @@ Collection.prototype.updateMany = function(filter, update, options, callback) {
   if(typeof options == 'function') callback = options, options = {};
   options = shallowClone(options)
 
-  // Add ignoreUndfined
+  // Add ignoreUndefined
   if(this.s.options.ignoreUndefined) {
     options = shallowClone(options);
     options.ignoreUndefined = this.s.options.ignoreUndefined;
@@ -1084,7 +1083,7 @@ var updateDocuments = function(self, selector, document, options, callback) {
 Collection.prototype.update = function(selector, document, options, callback) {
   var self = this;
 
-  // Add ignoreUndfined
+  // Add ignoreUndefined
   if(this.s.options.ignoreUndefined) {
     options = shallowClone(options);
     options.ignoreUndefined = this.s.options.ignoreUndefined;
@@ -1136,7 +1135,7 @@ Collection.prototype.deleteOne = function(filter, options, callback) {
   if(typeof options == 'function') callback = options, options = {};
   options = shallowClone(options);
 
-  // Add ignoreUndfined
+  // Add ignoreUndefined
   if(this.s.options.ignoreUndefined) {
     options = shallowClone(options);
     options.ignoreUndefined = this.s.options.ignoreUndefined;
@@ -1187,7 +1186,7 @@ Collection.prototype.deleteMany = function(filter, options, callback) {
   if(typeof options == 'function') callback = options, options = {};
   options = shallowClone(options);
 
-  // Add ignoreUndfined
+  // Add ignoreUndefined
   if(this.s.options.ignoreUndefined) {
     options = shallowClone(options);
     options.ignoreUndefined = this.s.options.ignoreUndefined;
@@ -1276,7 +1275,7 @@ define.classMethod('removeMany', {callback: true, promise:true});
 Collection.prototype.remove = function(selector, options, callback) {
   var self = this;
 
-  // Add ignoreUndfined
+  // Add ignoreUndefined
   if(this.s.options.ignoreUndefined) {
     options = shallowClone(options);
     options.ignoreUndefined = this.s.options.ignoreUndefined;
@@ -1314,7 +1313,7 @@ Collection.prototype.save = function(doc, options, callback) {
   if(typeof options == 'function') callback = options, options = {};
   options = options || {};
 
-  // Add ignoreUndfined
+  // Add ignoreUndefined
   if(this.s.options.ignoreUndefined) {
     options = shallowClone(options);
     options.ignoreUndefined = this.s.options.ignoreUndefined;
@@ -1386,7 +1385,7 @@ define.classMethod('save', {callback: true, promise:true});
  * @param {boolean} [options.promoteBuffers=false] Promotes Binary BSON values to native Node Buffers.
  * @param {(ReadPreference|string)} [options.readPreference=null] 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=null] Number of miliseconds to wait before aborting the query.
+ * @param {number} [options.maxTimeMS=null] Number of milliseconds to wait before aborting the query.
  * @param {object} [options.collation=null] Specify collation (MongoDB 3.4 or higher) settings for update operation (see 3.4 documentation for available fields).
  * @param {Collection~resultCallback} [callback] The command result callback
  * @return {Promise} returns Promise if no callback passed
@@ -1997,7 +1996,7 @@ define.classMethod('indexInformation', {callback: true, promise:true});
  * @param {boolean} [options.skip=null] The number of documents to skip for the count.
  * @param {string} [options.hint=null] An index name hint for the query.
  * @param {(ReadPreference|string)} [options.readPreference=null] The preferred read preference (ReadPreference.PRIMARY, ReadPreference.PRIMARY_PREFERRED, ReadPreference.SECONDARY, ReadPreference.SECONDARY_PREFERRED, ReadPreference.NEAREST).
- * @param {number} [options.maxTimeMS=null] Number of miliseconds to wait before aborting the query.
+ * @param {number} [options.maxTimeMS=null] Number of milliseconds to wait before aborting the query.
  * @param {Collection~countCallback} [callback] The command result callback
  * @return {Promise} returns Promise if no callback passed
  */
@@ -2070,7 +2069,7 @@ define.classMethod('count', {callback: true, promise:true});
  * @param {object} query The query for filtering the set of documents to which we apply the distinct filter.
  * @param {object} [options=null] Optional settings.
  * @param {(ReadPreference|string)} [options.readPreference=null] The preferred read preference (ReadPreference.PRIMARY, ReadPreference.PRIMARY_PREFERRED, ReadPreference.SECONDARY, ReadPreference.SECONDARY_PREFERRED, ReadPreference.NEAREST).
- * @param {number} [options.maxTimeMS=null] Number of miliseconds to wait before aborting the query.
+ * @param {number} [options.maxTimeMS=null] 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
  */
@@ -2656,13 +2655,18 @@ Collection.prototype.aggregate = function(pipeline, options, callback) {
   options = getReadPreference(this, options, this.s.db, this);
 
   // If explain has been specified add it
-  if(options.explain) command.explain = options.explain;
+  if (options.explain) command.explain = options.explain;
 
   // Validate that cursor options is valid
   if(options.cursor != null && typeof options.cursor != 'object') {
     throw toError('cursor options must be an object');
   }
 
+  if (this.s.topology.capabilities().hasAggregationCursor) {
+    options.cursor = options.cursor || { batchSize : 1000 };
+    command.cursor = options.cursor;
+  }
+
   // promiseLibrary
   options.promiseLibrary = this.s.promiseLibrary;
 
@@ -2673,11 +2677,6 @@ Collection.prototype.aggregate = function(pipeline, options, callback) {
       throw new MongoError('cannot connect to server');
     }
 
-    if(this.s.topology.capabilities().hasAggregationCursor) {
-      options.cursor = options.cursor || { batchSize : 1000 };
-      command.cursor = options.cursor;
-    }
-
     // Allow disk usage command
     if(typeof options.allowDiskUse == 'boolean') command.allowDiskUse = options.allowDiskUse;
     if(typeof options.maxTimeMS == 'number') command.maxTimeMS = options.maxTimeMS;
@@ -2686,12 +2685,18 @@ Collection.prototype.aggregate = function(pipeline, options, callback) {
     return this.s.topology.cursor(this.s.namespace, command, options);
   }
 
-  // We do not allow cursor
-  if(options.cursor) {
-    return this.s.topology.cursor(this.s.namespace, command, options);
+  if (options.cursor) {
+    var cursor = this.s.topology.cursor(this.s.namespace, command, options);
+    return cursor.toArray(function(err, result) {
+      if (err) {
+        return handleCallback(callback, err);
+      }
+
+      handleCallback(callback, null, result);
+    });
   }
 
-  // Execute the command
+  // For legacy server versions, we execute the command and format the result
   this.s.db.command(command, options, function(err, result) {
     if(err) {
       handleCallback(callback, err);
@@ -3366,6 +3371,7 @@ var testForFields = {
   , numberOfRetries: 1, awaitdata: 1, awaitData: 1, exhaust: 1, batchSize: 1, returnKey: 1, maxScan: 1, min: 1, max: 1, showDiskLoc: 1
   , comment: 1, raw: 1, readPreference: 1, partial: 1, read: 1, dbName: 1, oplogReplay: 1, connection: 1, maxTimeMS: 1, transforms: 1
   , collation: 1
+  , noCursorTimeout: 1
 }
 
 module.exports = Collection;

package/lib/command_cursor.js

@@ -240,7 +240,7 @@ define.classMethod('readBufferedDocuments', {callback: false, promise:false, ret
 /**
  * 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}
@@ -256,7 +256,7 @@ define.classMethod('readBufferedDocuments', {callback: false, promise:false, ret
 
 /**
  * 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

@@ -221,7 +221,8 @@ Cursor.prototype.hasNext = function(callback) {
       return callback(null, true);
     } else {
       return nextObject(self, function(err, doc) {
-        if(!doc) return callback(null, false);
+        if (err) return callback(err, null);
+        if (!doc) return callback(null, false);
         self.s.currentDoc = doc;
         callback(null, true);
       });
@@ -702,7 +703,7 @@ define.classMethod('next', {callback: true, promise:true});
 
 /**
  * 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
@@ -821,7 +822,7 @@ define.classMethod('setReadPreference', {callback: false, promise:false, returns
 /**
  * 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
  * @param {Cursor~toArrayResultCallback} [callback] The result callback.
@@ -899,7 +900,7 @@ define.classMethod('toArray', {callback: true, promise:true});
  * @param {object} [options=null] Optional settings.
  * @param {number} [options.skip=null] The number of documents to skip.
  * @param {number} [options.limit=null] The maximum amounts to count before aborting.
- * @param {number} [options.maxTimeMS=null] Number of miliseconds to wait before aborting the query.
+ * @param {number} [options.maxTimeMS=null] Number of milliseconds to wait before aborting the query.
  * @param {string} [options.hint=null] An index name hint for the query.
  * @param {(ReadPreference|string)} [options.readPreference=null] 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

@@ -173,6 +173,7 @@ var Db = function(databaseName, topology, options) {
   topology.once('fullsetup', createListener(self, 'fullsetup', self));
   topology.once('all', createListener(self, 'all', self));
   topology.on('reconnect', createListener(self, 'reconnect', self));
+  topology.on('reconnectFailed', createListener(self, 'reconnectFailed', self));
 }
 
 inherits(Db, EventEmitter);
@@ -767,7 +768,7 @@ var evaluate = function(self, code, parameters, options, callback) {
  * @param {Code} code JavaScript to execute on server.
  * @param {(object|array)} parameters The parameters for the call.
  * @param {object} [options=null] 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 {Db~resultCallback} [callback] The results callback
  * @deprecated Eval is deprecated on MongoDB 3.2 and forward
  * @return {Promise} returns Promise if no callback passed
@@ -1150,7 +1151,7 @@ var ensureIndex = function(self, name, fieldOrSpec, options, callback) {
   // Merge primary readPreference
   finalOptions.readPreference = ReadPreference.PRIMARY
 
-  // Check if the index allready exists
+  // Check if the index already exists
   self.indexInformation(name, finalOptions, function(err, indexInformation) {
     if(err != null && err.code != 26) return handleCallback(callback, err, null);
     // If the index does not exist, create it

package/lib/gridfs/grid_store.js

@@ -61,7 +61,7 @@ var REFERENCE_BY_FILENAME = 0,
  *
  * 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

@@ -35,10 +35,10 @@ var validOptionNames = ['poolSize', 'ssl', 'sslValidate', 'sslCA', 'sslCert',
   'socketTimeoutMS', 'reconnectTries', 'reconnectInterval', 'ha', 'haInterval',
   'replicaSet', 'secondaryAcceptableLatencyMS', 'acceptableLatencyMS',
   'connectWithNoPrimary', 'authSource', 'w', 'wtimeout', 'j', 'forceServerObjectId',
-  'serializeFunctions', 'ignoreUndefined', 'raw', 'promoteLongs', 'bufferMaxEntries',
+  'serializeFunctions', 'ignoreUndefined', 'raw', 'bufferMaxEntries',
   'readPreference', 'pkFactory', 'promiseLibrary', 'readConcern', 'maxStalenessSeconds',
   'loggerLevel', 'logger', 'promoteValues', 'promoteBuffers', 'promoteLongs',
-  'domainsEnabled', 'keepAliveInitialDelay', 'checkServerIdentity', 'validateOptions'];
+  'domainsEnabled', 'keepAliveInitialDelay', 'checkServerIdentity', 'validateOptions', 'appname', 'auth'];
 var ignoreOptionNames = ['native_parser'];
 var legacyOptionNames = ['server', 'replset', 'replSet', 'mongos', 'db'];
 
@@ -114,6 +114,8 @@ function MongoClient() {
    * @param {number} [options.acceptableLatencyMS=15] Cutoff latency point in MS for Mongos proxies selection.
    * @param {boolean} [options.connectWithNoPrimary=false] Sets if the driver should connect even if no primary is available
    * @param {string} [options.authSource=undefined] Define the database to authenticate against
+   * @param {string} [options.auth.user=undefined] The username for auth
+   * @param {string} [options.auth.password=undefined] The password for auth
    * @param {(number|string)} [options.w=null] The write concern.
    * @param {number} [options.wtimeout=null] The write concern timeout.
    * @param {boolean} [options.j=false] Specify a journal write concern.
@@ -132,6 +134,7 @@ function MongoClient() {
    * @param {object} [options.readConcern=null] 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 {number} [options.maxStalenessSeconds=undefined] The max staleness to secondary reads (values under 10 seconds cannot be guaranteed);
+   * @param {string} [options.appname=undefined] The name of the application that created this MongoClient instance. MongoDB 3.4 and newer will print this value in the server log upon establishing each connection. It is also recorded in the slow query log and profile collections.
    * @param {string} [options.loggerLevel=undefined] The logging level (error/warn/info/debug)
    * @param {object} [options.logger=undefined] Custom logger object
    * @param {object} [options.validateOptions=false] Validate MongoClient passed in options for correctness.
@@ -182,6 +185,8 @@ var define = MongoClient.define = new Define('MongoClient', MongoClient, false);
  * @param {number} [options.acceptableLatencyMS=15] Cutoff latency point in MS for Mongos proxies selection.
  * @param {boolean} [options.connectWithNoPrimary=false] Sets if the driver should connect even if no primary is available
  * @param {string} [options.authSource=undefined] Define the database to authenticate against
+ * @param {string} [options.auth.user=undefined] The username for auth
+ * @param {string} [options.auth.password=undefined] The password for auth
  * @param {(number|string)} [options.w=null] The write concern.
  * @param {number} [options.wtimeout=null] The write concern timeout.
  * @param {boolean} [options.j=false] Specify a journal write concern.
@@ -200,6 +205,7 @@ var define = MongoClient.define = new Define('MongoClient', MongoClient, false);
  * @param {object} [options.readConcern=null] 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 {number} [options.maxStalenessSeconds=undefined] The max staleness to secondary reads (values under 10 seconds cannot be guaranteed);
+ * @param {string} [options.appname=undefined] The name of the application that created this MongoClient instance. MongoDB 3.4 and newer will print this value in the server log upon establishing each connection. It is also recorded in the slow query log and profile collections.
  * @param {string} [options.loggerLevel=undefined] The logging level (error/warn/info/debug)
  * @param {object} [options.logger=undefined] Custom logger object
  * @param {object} [options.validateOptions=false] Validate MongoClient passed in options for correctness.
@@ -486,6 +492,10 @@ var connect = function(self, url, options, callback) {
   if(_finalOptions.socketTimeoutMS == null) _finalOptions.socketTimeoutMS = 360000;
   if(_finalOptions.connectTimeoutMS == null) _finalOptions.connectTimeoutMS = 30000;
 
+  if (_finalOptions.db_options && _finalOptions.db_options.auth) {
+    delete _finalOptions.db_options.auth;
+  }
+
   // Failure modes
   if(object.servers.length == 0) {
     throw new Error("connection string must contain at least one seed host");

package/lib/read_preference.js

@@ -39,7 +39,7 @@
  * @param {string} mode The ReadPreference mode as listed above.
  * @param {array|object} tags An object representing read preference tags.
  * @param {object} [options] Additional read preference options
- * @param {number} [options.maxStalenessSeconds] Max Secondary Read Stalleness in Seconds
+ * @param {number} [options.maxStalenessSeconds] Max Secondary Read Staleness in Seconds
  * @return {ReadPreference} a ReadPreference instance.
  */
 var ReadPreference = function(mode, tags, options) {

package/lib/server.js

@@ -70,8 +70,8 @@ var release = os.release();
  * @param {(Buffer|string)} [options.sslKey=null] String or buffer containing the certificate private key we wish to present (needs to have a mongod server with ssl support, 2.4 or higher)
  * @param {(Buffer|string)} [options.sslPass=null] String or buffer containing the certificate password (needs to have a mongod server with ssl support, 2.4 or higher)
  * @param {string} [options.servername=null] String containing the server name requested via TLS SNI.
+ * @param {boolean} [options.autoReconnect=true] Reconnect on error or timeout.
  * @param {object} [options.socketOptions=null] Socket options
- * @param {boolean} [options.socketOptions.autoReconnect=true] Reconnect on error.
  * @param {boolean} [options.socketOptions.noDelay=true] TCP Socket NoDelay option.
  * @param {number} [options.socketOptions.keepAlive=0] TCP KeepAlive on the socket with a X ms delay before start.
  * @param {number} [options.socketOptions.connectTimeoutMS=0] TCP Connection timeout setting