mongodb 2.2.26 → 2.2.27

package/HISTORY.md

@@ -1,3 +1,17 @@
+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

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/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});

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

@@ -736,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();
     }
   }
 
@@ -2040,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

package/lib/command_cursor.js

@@ -131,7 +131,7 @@ 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'
+var methodsToInherit = ['_next', 'next', 'hasNext', 'each', 'forEach', 'toArray'
   , 'rewind', 'bufferedCount', 'readBufferedDocuments', 'close', 'isClosed', 'kill', 'setCursorBatchSize'
   , '_find', '_getmore', '_killcursor', 'isDead', 'explain', 'isNotified', 'isKilled'];
 
@@ -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

@@ -941,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') {

package/lib/db.js

@@ -1,6 +1,7 @@
 "use strict";
 
 var EventEmitter = require('events').EventEmitter
+  , authenticate = require('./authenticate')
   , inherits = require('util').inherits
   , getSingleProperty = require('./utils').getSingleProperty
   , shallowClone = require('./utils').shallowClone
@@ -1469,74 +1470,6 @@ Db.prototype.removeUser = function(username, options, callback) {
   });
 };
 
-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}));
-  }
-}
-
 /**
  * Authenticate a user against the server.
  * @method
@@ -1546,44 +1479,11 @@ var authenticate = function(self, username, password, options, callback) {
  * @param {string} [options.authMechanism=MONGODB-CR] The authentication mechanism to use, GSSAPI, MONGODB-CR, MONGODB-X509, PLAIN
  * @param {Db~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.
  */
 Db.prototype.authenticate = function(username, password, options, callback) {
-  if(typeof options == 'function') callback = options, options = {};
-  var self = this;
-  // 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 this.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);
-    });
-  });
+  console.warn("Db.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.");  
+  return authenticate.apply(this, [this].concat(Array.prototype.slice.call(arguments)));
 };
 
 define.classMethod('authenticate', {callback: true, promise:true});

package/lib/mongo_client.js

@@ -4,13 +4,16 @@ var parse = require('./url_parser')
   , Server = require('./server')
   , Mongos = require('./mongos')
   , ReplSet = require('./replset')
+  , EventEmitter = require('events').EventEmitter
+  , inherits = require('util').inherits
   , Define = require('./metadata')
   , ReadPreference = require('./read_preference')
   , Logger = require('mongodb-core').Logger
   , MongoError = require('mongodb-core').MongoError
   , Db = require('./db')
   , f = require('util').format
-  , shallowClone = require('./utils').shallowClone;
+  , shallowClone = require('./utils').shallowClone
+  , authenticate = require('./authenticate');
 
 /**
  * @fileOverview The **MongoClient** class is a class that allows for making Connections to MongoDB.
@@ -65,6 +68,11 @@ function validOptions(options) {
  * @return {MongoClient} a MongoClient instance.
  */
 function MongoClient() {
+  if(!(this instanceof MongoClient)) return new MongoClient();
+
+  // Set up event emitter
+  EventEmitter.call(this);
+
   /**
    * The callback format for results
    * @callback MongoClient~connectCallback
@@ -120,7 +128,7 @@ function MongoClient() {
    * @param {object} [options.pkFactory=null] A primary key factory object for generation of custom _id keys.
    * @param {object} [options.promiseLibrary=null] A Promise library class the application wishes to use such as Bluebird, must be ES6 compatible
    * @param {object} [options.readConcern=null] 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 {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.loggerLevel=undefined] The logging level (error/warn/info/debug)
    * @param {object} [options.logger=undefined] Custom logger object
@@ -131,6 +139,11 @@ function MongoClient() {
   this.connect = MongoClient.connect;
 }
 
+/**
+ * @ignore
+ */
+inherits(MongoClient, EventEmitter);
+
 var define = MongoClient.define = new Define('MongoClient', MongoClient, false);
 
 /**
@@ -182,7 +195,7 @@ var define = MongoClient.define = new Define('MongoClient', MongoClient, false);
  * @param {object} [options.pkFactory=null] A primary key factory object for generation of custom _id keys.
  * @param {object} [options.promiseLibrary=null] A Promise library class the application wishes to use such as Bluebird, must be ES6 compatible
  * @param {object} [options.readConcern=null] 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 {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.loggerLevel=undefined] The logging level (error/warn/info/debug)
  * @param {object} [options.logger=undefined] Custom logger object
@@ -195,6 +208,7 @@ MongoClient.connect = function(url, options, callback) {
   callback = typeof args[args.length - 1] == 'function' ? args.pop() : null;
   options = args.length ? args.shift() : null;
   options = options || {};
+  var self = this;
 
   // Validate options object
   var err = validOptions(options);
@@ -214,7 +228,7 @@ MongoClient.connect = function(url, options, callback) {
       // Did we have a validation error
       if(err) return reject(err);
       // Attempt to connect
-      connect(url, options, function(err, db) {
+      connect(self, url, options, function(err, db) {
         if(err) return reject(err);
         resolve(db);
       });
@@ -224,7 +238,7 @@ MongoClient.connect = function(url, options, callback) {
   // Did we have a validation error
   if(err) return callback(err);
   // Fallback to callback based connect
-  connect(url, options, callback);
+  connect(self, url, options, callback);
 }
 
 define.staticMethod('connect', {callback: true, promise:true});
@@ -244,7 +258,7 @@ var mergeOptions = function(target, source, flatten) {
 var createUnifiedOptions = function(finalOptions, options) {
   var childOptions = ['mongos', 'server', 'db'
     , 'replset', 'db_options', 'server_options', 'rs_options', 'mongos_options'];
-  var noMerge = [];
+  var noMerge = ['readconcern'];
 
   for(var name in options) {
     if(noMerge.indexOf(name.toLowerCase()) != -1) {
@@ -291,25 +305,50 @@ function translateOptions(options) {
   });
 }
 
-function createReplicaset(options, callback) {
+function relayEvents(self, db) {
+  if(self instanceof MongoClient) {
+    var events = ["timeout", "close", 'serverOpening', 'serverDescriptionChanged', 'serverHeartbeatStarted',
+      'serverHeartbeatSucceeded', 'serverHeartbeatFailed', 'serverClosed', 'topologyOpening',
+      'topologyClosed', 'topologyDescriptionChanged', 'joined', 'left', 'ping', 'ha', 'all', 'fullsetup'];
+    events.forEach(function(event) {
+      db.serverConfig.on(event, function(object1, object2) {
+        self.emit(event, object1, object2);
+      });
+    });
+  }
+}
+
+function createReplicaset(self, options, callback) {
   // Set default options
   var servers = translateOptions(options);
   // Create Db instance
-  new Db(options.dbName, new ReplSet(servers, options), options).open(callback);
+  var db = new Db(options.dbName, new ReplSet(servers, options), options);
+  // Propegate the events to the client
+  relayEvents(self, db);
+  // Open the connection  
+  db.open(callback);
 }
 
-function createMongos(options, callback) {
+function createMongos(self, options, callback) {
   // Set default options
   var servers = translateOptions(options);
   // Create Db instance
-  new Db(options.dbName, new Mongos(servers, options), options).open(callback);
+  var db = new Db(options.dbName, new Mongos(servers, options), options)
+  // Propegate the events to the client
+  relayEvents(self, db);
+  // Open the connection  
+  db.open(callback);
 }
 
-function createServer(options, callback) {
+function createServer(self, options, callback) {
   // Set default options
   var servers = translateOptions(options);
+  // Create db instance
+  var db = new Db(options.dbName, servers[0], options);
+  // Propegate the events to the client
+  relayEvents(self, db);
   // Create Db instance
-  new Db(options.dbName, servers[0], options).open(function(err, db) {
+  db.open(function(err, db) {
     if(err) return callback(err);
     // Check if we are really speaking to a mongos
     var ismaster = db.serverConfig.lastIsMaster();
@@ -319,7 +358,7 @@ function createServer(options, callback) {
       // Destroy the current connection
       db.close();
       // Create mongos connection instead
-      return createMongos(options, callback);
+      return createMongos(self, options, callback);
     }
 
     // Otherwise callback
@@ -359,7 +398,7 @@ function connectHandler(options, callback) {
     }
 
     // Authenticate
-    authentication_db.authenticate(options.user, options.password, options, function(err, success){
+    authenticate(authentication_db, options.user, options.password, options, function(err, success) {
       if(success){
         process.nextTick(function() {
           try {
@@ -387,7 +426,7 @@ function connectHandler(options, callback) {
 /*
  * Connect using MongoClient
  */
-var connect = function(url, options, callback) {
+var connect = function(self, url, options, callback) {
   options = options || {};
   options = shallowClone(options);
 
@@ -430,11 +469,11 @@ var connect = function(url, options, callback) {
 
   // Do we have a replicaset then skip discovery and go straight to connectivity
   if(_finalOptions.replicaSet || _finalOptions.rs_name) {
-    return createReplicaset(_finalOptions, connectHandler(_finalOptions, connectCallback));
+    return createReplicaset(self, _finalOptions, connectHandler(_finalOptions, connectCallback));
   } else if(object.servers.length > 1) {
-    return createMongos(_finalOptions, connectHandler(_finalOptions, connectCallback));
+    return createMongos(self, _finalOptions, connectHandler(_finalOptions, connectCallback));
   } else {
-    return createServer(_finalOptions, connectHandler(_finalOptions, connectCallback));
+    return createServer(self, _finalOptions, connectHandler(_finalOptions, connectCallback));
   }
 }
 

package/lib/replset.js

@@ -270,69 +270,95 @@ ReplSet.prototype.connect = function(db, _options, callback) {
     }
   }
 
-  // Connect handler
-  var connectHandler = function() {
-    // Clear out all the current handlers left over
-    ["timeout", "error", "close", 'serverOpening', 'serverDescriptionChanged', 'serverHeartbeatStarted',
-      'serverHeartbeatSucceeded', 'serverHeartbeatFailed', 'serverClosed', 'topologyOpening',
-      'topologyClosed', 'topologyDescriptionChanged'].forEach(function(e) {
-      self.s.replset.removeAllListeners(e);
-    });
-
-    // Set up listeners
-    self.s.replset.once('timeout', errorHandler('timeout'));
-    self.s.replset.once('error', errorHandler('error'));
-    self.s.replset.once('close', errorHandler('close'));
+  // Clear out all the current handlers left over
+  var events = ["timeout", "error", "close", 'serverOpening', 'serverDescriptionChanged', 'serverHeartbeatStarted',
+    'serverHeartbeatSucceeded', 'serverHeartbeatFailed', 'serverClosed', 'topologyOpening',
+    'topologyClosed', 'topologyDescriptionChanged', 'joined', 'left', 'ping', 'ha'];
+  events.forEach(function(e) {
+    self.s.replset.removeAllListeners(e);
+  });
 
-    // relay the event
-    var relay = function(event) {
-      return function(t, server) {
-        self.emit(event, t, server);
-      }
+  // relay the event
+  var relay = function(event) {
+    return function(t, server) {
+      self.emit(event, t, server);
     }
+  }
 
-    // Replset events relay
-    var replsetRelay = function(event) {
-      return function(t, server) {
-        self.emit(event, t, server.lastIsMaster(), server);
-      }
+  // Replset events relay
+  var replsetRelay = function(event) {
+    return function(t, server) {
+      self.emit(event, t, server.lastIsMaster(), server);
     }
+  }
 
-    // Relay ha
-    var relayHa = function(t, state) {
-      self.emit('ha', t, state);
+  // Relay ha
+  var relayHa = function(t, state) {
+    self.emit('ha', t, state);
 
-      if(t == 'start') {
-        self.emit('ha_connect', t, state);
-      } else if(t == 'end') {
-        self.emit('ha_ismaster', t, state);
-      }
+    if(t == 'start') {
+      self.emit('ha_connect', t, state);
+    } else if(t == 'end') {
+      self.emit('ha_ismaster', t, state);
     }
+  }
 
-    // Set up serverConfig listeners
-    self.s.replset.on('joined', replsetRelay('joined'));
-    self.s.replset.on('left', relay('left'));
-    self.s.replset.on('ping', relay('ping'));
-    self.s.replset.on('ha', relayHa);
-
-    // Set up SDAM listeners
-    self.s.replset.on('serverDescriptionChanged', relay('serverDescriptionChanged'));
-    self.s.replset.on('serverHeartbeatStarted', relay('serverHeartbeatStarted'));
-    self.s.replset.on('serverHeartbeatSucceeded', relay('serverHeartbeatSucceeded'));
-    self.s.replset.on('serverHeartbeatFailed', relay('serverHeartbeatFailed'));
-    self.s.replset.on('serverOpening', relay('serverOpening'));
-    self.s.replset.on('serverClosed', relay('serverClosed'));
-    self.s.replset.on('topologyOpening', relay('topologyOpening'));
-    self.s.replset.on('topologyClosed', relay('topologyClosed'));
-    self.s.replset.on('topologyDescriptionChanged', relay('topologyDescriptionChanged'));
-
-    self.s.replset.on('fullsetup', function() {
-      self.emit('fullsetup', null, self);
-    });
+  // Set up serverConfig listeners
+  self.s.replset.on('joined', replsetRelay('joined'));
+  self.s.replset.on('left', relay('left'));
+  self.s.replset.on('ping', relay('ping'));
+  self.s.replset.on('ha', relayHa);
+
+  // Set up SDAM listeners
+  self.s.replset.on('serverDescriptionChanged', relay('serverDescriptionChanged'));
+  self.s.replset.on('serverHeartbeatStarted', relay('serverHeartbeatStarted'));
+  self.s.replset.on('serverHeartbeatSucceeded', relay('serverHeartbeatSucceeded'));
+  self.s.replset.on('serverHeartbeatFailed', relay('serverHeartbeatFailed'));
+  self.s.replset.on('serverOpening', relay('serverOpening'));
+  self.s.replset.on('serverClosed', relay('serverClosed'));
+  self.s.replset.on('topologyOpening', relay('topologyOpening'));
+  self.s.replset.on('topologyClosed', relay('topologyClosed'));
+  self.s.replset.on('topologyDescriptionChanged', relay('topologyDescriptionChanged'));
+
+  self.s.replset.on('fullsetup', function() {
+    self.emit('fullsetup', null, self);
+  });
 
-    self.s.replset.on('all', function() {
-      self.emit('all', null, self);
-    });
+  self.s.replset.on('all', function() {
+    self.emit('all', null, self);
+  });
+
+  // Connect handler
+  var connectHandler = function() {
+    // Set up listeners
+    self.s.replset.once('timeout', errorHandler('timeout'));
+    self.s.replset.once('error', errorHandler('error'));
+    self.s.replset.once('close', errorHandler('close'));
+
+    // // Set up serverConfig listeners
+    // self.s.replset.on('joined', replsetRelay('joined'));
+    // self.s.replset.on('left', relay('left'));
+    // self.s.replset.on('ping', relay('ping'));
+    // self.s.replset.on('ha', relayHa);
+
+    // // Set up SDAM listeners
+    // self.s.replset.on('serverDescriptionChanged', relay('serverDescriptionChanged'));
+    // self.s.replset.on('serverHeartbeatStarted', relay('serverHeartbeatStarted'));
+    // self.s.replset.on('serverHeartbeatSucceeded', relay('serverHeartbeatSucceeded'));
+    // self.s.replset.on('serverHeartbeatFailed', relay('serverHeartbeatFailed'));
+    // self.s.replset.on('serverOpening', relay('serverOpening'));
+    // self.s.replset.on('serverClosed', relay('serverClosed'));
+    // self.s.replset.on('topologyOpening', relay('topologyOpening'));
+    // self.s.replset.on('topologyClosed', relay('topologyClosed'));
+    // self.s.replset.on('topologyDescriptionChanged', relay('topologyDescriptionChanged'));
+
+    // self.s.replset.on('fullsetup', function() {
+    //   self.emit('fullsetup', null, self);
+    // });
+
+    // self.s.replset.on('all', function() {
+    //   self.emit('all', null, self);
+    // });
 
     // Emit open event
     self.emit('open', null, self);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mongodb",
-  "version": "2.2.26",
+  "version": "2.2.27",
   "description": "The official MongoDB driver for Node.js",
   "main": "index.js",
   "repository": {
@@ -14,7 +14,7 @@
   ],
   "dependencies": {
     "es6-promise": "3.2.1",
-    "mongodb-core": "2.1.10",
+    "mongodb-core": "2.1.11",
     "readable-stream": "2.2.7"
   },
   "devDependencies": {