mongodb 2.2.23 → 2.2.27

package/HISTORY.md

@@ -1,3 +1,61 @@
+2.2.27 2017-05-22
+-----------------
+* Updated mongodb-core to 2.1.11
+    * NODE-987 Clear out old intervalIds on when calling topologyMonitor.
+    * NODE-987 Moved filtering to pingServer method and added test case.
+    * Check for connection destroyed just before writing out and flush out operations correctly if it is (Issue #179, https://github.com/jmholzinger).
+    * NODE-989 Refactored Replicaset monitoring to correcly monitor newly added servers, Also extracted setTimeout and setInterval to use custom wrappers Timeout and Interval.
+* NODE-985 Deprecated Db.authenticate and Admin.authenticate and moved auth methods into authenticate.js to ensure MongoClient.connect does not print deprecation warnings.
+* NODE-988 Merged readConcern and hint correctly on collection(...).find(...).count()
+* Fix passing the readConcern option to MongoClient.connect (Issue #1514, https://github.com/bausmeier).
+* NODE-996 Propegate all events up to a MongoClient instance.
+* Allow saving doc with null `_id` (Issue #1517, https://github.com/vkarpov15).
+* NODE-993 Expose hasNext for command cursor and add docs for both CommandCursor and Aggregation Cursor.
+
+2.2.26 2017-04-18
+-----------------
+* Updated mongodb-core to 2.1.10
+    * NODE-981 delegate auth to replset/mongos if inTopology is set.
+    * NODE-978 Wrap connection.end in try/catch for node 0.10.x issue causing exceptions to be thrown, Also surfaced getConnection for mongos and replset.
+    * Remove dynamic require (Issue #175, https://github.com/tellnes).
+    * NODE-696 Handle interrupted error for createIndexes.
+    * Fixed isse when user is executing find command using Server.command and it get interpreted as a wire protcol message, #172.
+    * NODE-966 promoteValues not being promoted correctly to getMore.
+    * Merged in fix for flushing out monitoring operations.
+* NODE-983 Add cursorId to aggregate and listCollections commands (Issue, #1510).
+* Mark group and profilingInfo as deprecated methods
+* NODE-956 DOCS Examples.
+* Update readable-stream to version 2.2.7.
+* NODE-978 Added test case to uncover connection.end issue for node 0.10.x.
+* NODE-972 Fix(db): don't remove database name if collectionName == dbName (Issue, #1502)
+* Fixed merging of writeConcerns on db.collection method.
+* NODE-970 mix in readPreference for strict mode listCollections callback.
+* NODE-966 added testcase for promoteValues being applied to getMore commands.
+* NODE-962 Merge in ignoreUndefined from collection level for find/findOne.
+* Remove multi option from updateMany tests/docs (Issue #1499, https://github.com/spratt).
+* NODE-963 Correctly handle cursor.count when using APM.
+
+2.2.25 2017-03-17
+-----------------
+* Don't rely on global toString() for checking if object (Issue #1494, https://github.com/vkarpov15).
+* Remove obsolete option uri_decode_auth (Issue #1488, https://github.com/kamagatos).
+* NODE-936 Correctly translate ReadPreference to CoreReadPreference for mongos queries.
+* Exposed BSONRegExp type.
+* NODE-950 push correct index for INSERT ops (https://github.com/mbroadst).
+* NODE-951 Added support for sslCRL option and added a test case for it.
+* NODE-953 Made batchSize issue general at cursor level.
+* NODE-954 Remove write concern from reindex helper as it will not be supported in 3.6.
+* Updated mongodb-core to 2.1.9.
+    * Return lastIsMaster correctly when connecting with secondaryOnlyConnectionAllowed is set to true and only a secondary is available in replica state.
+    * Clone options when passed to wireProtocol handler to avoid intermittent modifications causing errors.
+    * Ensure SSL error propegates better for Replset connections when there is a SSL validation error.
+    * NODE-957 Fixed issue where < batchSize not causing cursor to be closed on execution of first batch.
+    * NODE-958 Store reconnectConnection on pool object to allow destroy to close immediately.
+
+2.2.24 2017-02-14
+-----------------
+* NODE-935, NODE-931 Make MongoClient strict options validation optional and instead print annoying console.warn entries.
+
 2.2.23 2017-02-13
 -----------------
 * Updated mongodb-core to 2.1.8.

package/README.md

@@ -2,7 +2,7 @@
 
 [![Build Status](https://secure.travis-ci.org/mongodb/node-mongodb-native.svg?branch=2.1)](http://travis-ci.org/mongodb/node-mongodb-native)
 [![Coverage Status](https://coveralls.io/repos/github/mongodb/node-mongodb-native/badge.svg?branch=2.1)](https://coveralls.io/github/mongodb/node-mongodb-native?branch=2.1)
-[![Gitter](https://badges.gitter.im/Join Chat.svg)](https://gitter.im/mongodb/node-mongodb-native?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge)
+[![Gitter](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/mongodb/node-mongodb-native?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge)
 
 # Description
 

package/conf.json

@@ -36,7 +36,10 @@
       "node_modules/bson/lib/bson/symbol.js",
       "node_modules/bson/lib/bson/timestamp.js",
       "node_modules/bson/lib/bson/max_key.js",
-      "node_modules/bson/lib/bson/min_key.js"
+      "node_modules/bson/lib/bson/min_key.js",
+      "node_modules/bson/lib/bson/decimal128.js",
+      "node_modules/bson/lib/bson/int_32.js",
+      "node_modules/bson/lib/bson/regexp.js"
     ]
   },
   "templates": {

package/index.js

@@ -40,6 +40,7 @@ connect.ObjectID = core.BSON.ObjectID;
 connect.ObjectId = core.BSON.ObjectID;
 connect.Symbol = core.BSON.Symbol;
 connect.Timestamp = core.BSON.Timestamp;
+connect.BSONRegExp = core.BSON.BSONRegExp;
 connect.Decimal128 = core.BSON.Decimal128;
 
 // Add connect method

package/lib/admin.js

@@ -2,7 +2,9 @@
 
 var toError = require('./utils').toError,
   Define = require('./metadata'),
-  shallowClone = require('./utils').shallowClone;
+  shallowClone = require('./utils').shallowClone,
+  assign = require('./utils').assign,
+  authenticate = require('./authenticate');
 
 /**
  * @fileOverview The **Admin** class is an internal class that allows convenient access to
@@ -239,23 +241,23 @@ define.classMethod('ping', {callback: true, promise:true});
  * @param {string} [password] The password.
  * @param {Admin~resultCallback} [callback] The command result callback
  * @return {Promise} returns Promise if no callback passed
+ * @deprecated This method will no longer be available in the next major release 3.x as MongoDB 3.6 will only allow auth against users in the admin db and will no longer allow multiple credentials on a socket. Please authenticate using MongoClient.connect with auth credentials.
  */
 Admin.prototype.authenticate = function(username, password, options, callback) {
-  var self = this;
-  if(typeof options == 'function') callback = options, options = {};
-  options = shallowClone(options);
-  options.authdb = 'admin';
-
-  // Execute using callback
-  if(typeof callback == 'function') return this.s.db.authenticate(username, password, options, callback);
+  console.warn("Admin.prototype.authenticate method will no longer be available in the next major release 3.x as MongoDB 3.6 will only allow auth against users in the admin db and will no longer allow multiple credentials on a socket. Please authenticate using MongoClient.connect with auth credentials.");
+  var finalArguments = [this.s.db];
+  if(typeof username == 'string') finalArguments.push(username);
+  if(typeof password == 'string') finalArguments.push(password);
+  if(typeof options == 'function') { 
+    finalArguments.push({ authdb: 'admin' });
+    finalArguments.push(options);
+  } else {
+    finalArguments.push(assign({}, options, { authdb: 'admin' }));
+  }
 
-  // Return a Promise
-  return new this.s.promiseLibrary(function(resolve, reject) {
-    self.s.db.authenticate(username, password, options, function(err, r) {
-      if(err) return reject(err);
-      resolve(r);
-    });
-  });
+  if(typeof callback == 'function') finalArguments.push(callback);
+  // Excute authenticate method
+  return authenticate.apply(this.s.db, finalArguments);
 }
 
 define.classMethod('authenticate', {callback: true, promise:true});
@@ -437,6 +439,7 @@ define.classMethod('setProfilingLevel', {callback: true, promise:true});
  *
  * @param {Admin~resultCallback} [callback] The command result callback.
  * @return {Promise} returns Promise if no callback passed
+ * @deprecated Query the system.profile collection directly.
  */
 Admin.prototype.profilingInfo = function(callback) {
   var self = this;

package/lib/aggregation_cursor.js

@@ -316,6 +316,7 @@ AggregationCursor.prototype.get = AggregationCursor.prototype.toArray;
 define.classMethod('toArray', {callback: true, promise:true});
 define.classMethod('each', {callback: true, promise:false});
 define.classMethod('forEach', {callback: true, promise:false});
+define.classMethod('hasNext', {callback: true, promise:true});
 define.classMethod('next', {callback: true, promise:true});
 define.classMethod('close', {callback: true, promise:true});
 define.classMethod('isClosed', {callback: false, promise:false, returns: [Boolean]});
@@ -331,6 +332,14 @@ define.classMethod('readBufferedDocuments', {callback: false, promise:false, ret
  * @return {Promise} returns Promise if no callback passed
  */
 
+/**
+ * Check if there is any document still available in the cursor
+ * @function AggregationCursor.prototype.hasNext
+ * @param {AggregationCursor~resultCallback} [callback] The result callback.
+ * @throws {MongoError}
+ * @return {Promise} returns Promise if no callback passed
+ */
+
 /**
  * The callback format for results
  * @callback AggregationCursor~toArrayResultCallback

package/lib/apm.js

@@ -493,7 +493,9 @@ var Instrumentation = function(core, options, callback) {
                     nextBatch: cursor.cursorState.documents
                   }, ok:1
                 }
-              } else if(commandName.toLowerCase() == 'find' && r == null) {
+              } else if((commandName.toLowerCase() == 'find' 
+                || commandName.toLowerCase() == 'aggregate'
+                || commandName.toLowerCase() == 'listcollections') && r == null) {
                 r = {
                   cursor: {
                     id: cursor.cursorState.cursorId,

package/lib/authenticate.js

@@ -0,0 +1,109 @@
+var shallowClone = require('./utils').shallowClone
+  , handleCallback = require('./utils').handleCallback
+  , MongoError = require('mongodb-core').MongoError;
+
+var authenticate = function(self, username, password, options, callback) {
+  // Did the user destroy the topology
+  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
+  var authdb = options.dbName ? options.dbName : self.databaseName;
+  authdb = self.authSource ? self.authSource : authdb;
+  authdb = options.authdb ? options.authdb : authdb;
+  authdb = options.authSource ? options.authSource : authdb;
+
+  // Callback
+  var _callback = function(err, result) {
+    if(self.listeners('authenticated').length > 0) {
+      self.emit('authenticated', err, result);
+    }
+
+    // Return to caller
+    handleCallback(callback, err, result);
+  }
+
+  // authMechanism
+  var authMechanism = options.authMechanism || '';
+  authMechanism = authMechanism.toUpperCase();
+
+  // If classic auth delegate to auth command
+  if(authMechanism == 'MONGODB-CR') {
+    self.s.topology.auth('mongocr', authdb, username, password, function(err) {
+      if(err) return handleCallback(callback, err, false);
+      _callback(null, true);
+    });
+  } else if(authMechanism == 'PLAIN') {
+    self.s.topology.auth('plain', authdb, username, password, function(err) {
+      if(err) return handleCallback(callback, err, false);
+      _callback(null, true);
+    });
+  } else if(authMechanism == 'MONGODB-X509') {
+    self.s.topology.auth('x509', authdb, username, password, function(err) {
+      if(err) return handleCallback(callback, err, false);
+      _callback(null, true);
+    });
+  } else if(authMechanism == 'SCRAM-SHA-1') {
+    self.s.topology.auth('scram-sha-1', authdb, username, password, function(err) {
+      if(err) return handleCallback(callback, err, false);
+      _callback(null, true);
+    });
+  } else if(authMechanism == 'GSSAPI') {
+    if(process.platform == 'win32') {
+      self.s.topology.auth('sspi', authdb, username, password, options, function(err) {
+        if(err) return handleCallback(callback, err, false);
+        _callback(null, true);
+      });
+    } else {
+      self.s.topology.auth('gssapi', authdb, username, password, options, function(err) {
+        if(err) return handleCallback(callback, err, false);
+        _callback(null, true);
+      });
+    }
+  } else if(authMechanism == 'DEFAULT') {
+    self.s.topology.auth('default', authdb, username, password, function(err) {
+      if(err) return handleCallback(callback, err, false);
+      _callback(null, true);
+    });
+  } else {
+    handleCallback(callback, MongoError.create({message: f("authentication mechanism %s not supported", options.authMechanism), driver:true}));
+  }
+}
+
+module.exports = function(self, username, password, options, callback) {
+  if(typeof options == 'function') callback = options, options = {};
+  // Shallow copy the options
+  options = shallowClone(options);
+
+  // Set default mechanism
+  if(!options.authMechanism) {
+    options.authMechanism = 'DEFAULT';
+  } else if(options.authMechanism != 'GSSAPI'
+    && options.authMechanism != 'DEFAULT'
+    && options.authMechanism != 'MONGODB-CR'
+    && options.authMechanism != 'MONGODB-X509'
+    && options.authMechanism != 'SCRAM-SHA-1'
+    && options.authMechanism != 'PLAIN') {
+      return handleCallback(callback, MongoError.create({message: "only DEFAULT, GSSAPI, PLAIN, MONGODB-X509, SCRAM-SHA-1 or MONGODB-CR is supported by authMechanism", driver:true}));
+  }
+
+  // If we have a callback fallback
+  if(typeof callback == 'function') return authenticate(self, username, password, options, function(err, r) {
+    // Support failed auth method
+    if(err && err.message && err.message.indexOf('saslStart') != -1) err.code = 59;
+    // Reject error
+    if(err) return callback(err, r);
+    callback(null, r);
+  });
+
+  // Return a promise
+  return new self.s.promiseLibrary(function(resolve, reject) {
+    authenticate(self, username, password, options, function(err, r) {
+      // Support failed auth method
+      if(err && err.message && err.message.indexOf('saslStart') != -1) err.code = 59;
+      // Reject error
+      if(err) return reject(err);
+      resolve(r);
+    });
+  });
+};

package/lib/bulk/unordered.js

@@ -95,7 +95,7 @@ FindOperatorsUnordered.prototype.replaceOne = function(updateDocument) {
  *
  * @method
  * @throws {MongoError}
- * @return {UnorderedBulkOperation}
+ * @return {FindOperatorsUnordered}
  */
 FindOperatorsUnordered.prototype.upsert = function() {
   this.s.currentOp.upsert = true;
@@ -148,7 +148,7 @@ FindOperatorsUnordered.prototype.remove = function() {
 var addToOperationsList = function(_self, docType, document) {
   // Get the bsonSize
   var bsonSize = bson.calculateObjectSize(document, {
-		checkKeys: false,		
+		checkKeys: false,
 	});
   // Throw error if the doc is bigger than the max BSON size
   if(bsonSize >= _self.s.maxBatchSizeBytes) throw toError("document is larger than the maximum size " + _self.s.maxBatchSizeBytes);
@@ -189,7 +189,7 @@ var addToOperationsList = function(_self, docType, document) {
   // Save back the current Batch to the right type
   if(docType == common.INSERT) {
     _self.s.currentInsertBatch = _self.s.currentBatch;
-    _self.s.bulkResult.insertedIds.push({index: _self.s.currentIndex, _id: document._id});
+    _self.s.bulkResult.insertedIds.push({index: _self.s.bulkResult.insertedIds.length, _id: document._id});
   } else if(docType == common.UPDATE) {
     _self.s.currentUpdateBatch = _self.s.currentBatch;
   } else if(docType == common.REMOVE) {

package/lib/collection.js

@@ -21,7 +21,8 @@ var checkCollectionName = require('./utils').checkCollectionName
   , Cursor = require('./cursor')
   , unordered = require('./bulk/unordered')
   , ordered = require('./bulk/ordered')
-  , assign = require('./utils').assign;
+  , assign = require('./utils').assign
+  , mergeOptions = require('./utils').mergeOptions;
 
 /**
  * @fileOverview The **Collection** class is an internal class that embodies a MongoDB collection
@@ -46,6 +47,8 @@ var checkCollectionName = require('./utils').checkCollectionName
  * });
  */
 
+var mergeKeys = ['readPreference', 'ignoreUndefined'];
+
 /**
  * Create a new Collection instance (INTERNAL TYPE, do not instantiate directly)
  * @class
@@ -274,6 +277,14 @@ Collection.prototype.find = function() {
   if (!options) options = {};
 
   var newOptions = {};
+
+  // Make a shallow copy of the collection options
+  for(var key in this.s.options) {
+    if(mergeKeys.indexOf(key) != -1) {
+      newOptions[key] = this.s.options[key];
+    }
+  }
+
   // Make a shallow copy of options
   for (var key in options) {
     newOptions[key] = options[key];
@@ -725,7 +736,7 @@ var insertDocuments = function(self, docs, options, callback) {
   // Add _id if not specified
   if(forceServerObjectId !== true){
     for(var i = 0; i < docs.length; i++) {
-      if(docs[i]._id == null) docs[i]._id = self.s.pkFactory.createPk();
+      if(docs[i]._id === void 0) docs[i]._id = self.s.pkFactory.createPk();
     }
   }
 
@@ -1787,9 +1798,6 @@ var reIndex = function(self, options, callback) {
   // Reindex
   var cmd = {'reIndex':self.s.name};
 
-  // Decorate command with writeConcern if supported
-  decorateWithWriteConcern(cmd, self, options);
-
   // Execute the command
   self.s.db.command(cmd, options, function(err, result) {
     if(callback == null) return;
@@ -2032,7 +2040,7 @@ var count = function(self, query, options, callback) {
   if(typeof skip == 'number') cmd.skip = skip;
   if(typeof limit == 'number') cmd.limit = limit;
   if(typeof maxTimeMS == 'number') cmd.maxTimeMS = maxTimeMS;
-  if(hint) options.hint = hint;
+  if(hint) cmd.hint = hint;
 
   options = shallowClone(options);
   // Ensure we have the right read preference inheritance
@@ -2980,6 +2988,7 @@ var groupFunction = 'function () {\nvar c = db[ns].find(condition);\nvar map = n
  * @param {(ReadPreference|string)} [options.readPreference=null] The preferred read preference (ReadPreference.PRIMARY, ReadPreference.PRIMARY_PREFERRED, ReadPreference.SECONDARY, ReadPreference.SECONDARY_PREFERRED, ReadPreference.NEAREST).
  * @param {Collection~resultCallback} [callback] The command result callback
  * @return {Promise} returns Promise if no callback passed
+ * @deprecated MongoDB 3.6 or higher will no longer support the group command. We recommend rewriting using the aggregation framework.
  */
 Collection.prototype.group = function(keys, condition, initial, reduce, finalize, command, options, callback) {
   var self = this;
@@ -3185,16 +3194,23 @@ var mapReduce = function(self, map, reduce, options, callback) {
     , reduce: reduce
   };
 
+  // Exclusion list
+  var exclusionList = ['readPreference'];
+
   // Add any other options passed in
   for(var n in options) {
     if('scope' == n) {
       mapCommandHash[n] = processScope(options[n]);
     } else {
-      mapCommandHash[n] = options[n];
+      // Only include if not in exclusion list
+      if(exclusionList.indexOf(n) == -1) {
+        mapCommandHash[n] = options[n];
+      }
     }
   }
 
   options = shallowClone(options);
+
   // Ensure we have the right read preference inheritance
   options = getReadPreference(self, options, self.s.db, self);
 

package/lib/command_cursor.js

@@ -131,8 +131,8 @@ var CommandCursor = function(bson, ns, cmd, options, topology, topologyOptions)
 inherits(CommandCursor, Readable);
 
 // Set the methods to inherit from prototype
-var methodsToInherit = ['_next', 'next', 'each', 'forEach', 'toArray'
-  , 'rewind', 'bufferedCount', 'readBufferedDocuments', 'close', 'isClosed', 'kill'
+var methodsToInherit = ['_next', 'next', 'hasNext', 'each', 'forEach', 'toArray'
+  , 'rewind', 'bufferedCount', 'readBufferedDocuments', 'close', 'isClosed', 'kill', 'setCursorBatchSize'
   , '_find', '_getmore', '_killcursor', 'isDead', 'explain', 'isNotified', 'isKilled'];
 
 // Only inherit the types we need
@@ -207,6 +207,7 @@ define.classMethod('toArray', {callback: true, promise:true});
 define.classMethod('each', {callback: true, promise:false});
 define.classMethod('forEach', {callback: true, promise:false});
 define.classMethod('next', {callback: true, promise:true});
+define.classMethod('hasNext', {callback: true, promise:true});
 define.classMethod('close', {callback: true, promise:true});
 define.classMethod('isClosed', {callback: false, promise:false, returns: [Boolean]});
 define.classMethod('rewind', {callback: false, promise:false});
@@ -221,6 +222,14 @@ define.classMethod('readBufferedDocuments', {callback: false, promise:false, ret
  * @return {Promise} returns Promise if no callback passed
  */
 
+/**
+ * Check if there is any document still available in the cursor
+ * @function CommandCursor.prototype.hasNext
+ * @param {CommandCursor~resultCallback} [callback] The result callback.
+ * @throws {MongoError}
+ * @return {Promise} returns Promise if no callback passed
+ */
+
 /**
  * The callback format for results
  * @callback CommandCursor~toArrayResultCallback

package/lib/cursor.js

@@ -155,6 +155,14 @@ var Cursor = function(bson, ns, cmd, options, topology, topologyOptions) {
 
   // Set the sort value
   this.sortValue = self.s.cmd.sort;
+
+  // Get the batchSize
+  var batchSize = cmd.cursor && cmd.cursor.batchSize
+    ? cmd.cursor && cmd.cursor.batchSize
+    : (options.cursor && options.cursor.batchSize ? options.cursor.batchSize : 1000);
+
+  // Set the batchSize
+  this.setCursorBatchSize(batchSize);
 }
 
 /**
@@ -933,6 +941,16 @@ var count = function(self, applySkipLimit, opts, callback) {
     'count': self.s.ns.substr(delimiter+1), 'query': self.s.cmd.query
   }
 
+  // Apply a readConcern if set
+  if(self.s.cmd.readConcern) {
+    command.readConcern = self.s.cmd.readConcern;
+  }
+
+  // Apply a hint if set
+  if(self.s.cmd.hint) {
+    command.hint = self.s.cmd.hint;
+  }
+
   if(typeof opts.maxTimeMS == 'number') {
     command.maxTimeMS = opts.maxTimeMS;
   } else if(self.s.cmd && typeof self.s.cmd.maxTimeMS == 'number') {
@@ -944,11 +962,14 @@ var count = function(self, applySkipLimit, opts, callback) {
   if(opts.limit) command.limit = opts.limit;
   if(self.s.options.hint) command.hint = self.s.options.hint;
 
+  // Set cursor server to the same as the topology
+  self.server = self.topology;
+
   // Execute the command
   self.topology.command(f("%s.$cmd", self.s.ns.substr(0, delimiter))
     , command, function(err, result) {
       callback(err, result ? result.result.n : null)
-    });
+    }, self.options);
 }
 
 define.classMethod('count', {callback: true, promise:true});