mongodb 2.2.27 → 2.2.31

package/HISTORY.md

@@ -1,3 +1,43 @@
+2.2.31 2017-08-08
+-----------------
+* update mongodb-core to 2.2.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.2.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
+  * NODE-1039 ensure we force destroy server instances, forcing queue to be flushed.
+  *  Use actual server type in standalone SDAM events.
+* Allow multiple map calls (Issue #1521, https://github.com/Robbilie).
+* Clone insertMany options before mutating (Issue #1522, https://github.com/vkarpov15).
+* NODE-1034 Fix GridStore issue caused by Node 8.0.0 breaking backward compatible fs.read API.
+* NODE-1026, use  operator instead of skip function in order to avoid useless fetch stage.
+
+2.2.28 2017-06-02
+-----------------
+* Update mongodb-core to 2.1.12
+  * NODE-1019 Set keepAlive to 300 seconds or 1/2 of socketTimeout if socketTimeout < keepAlive.
+  * Minor fix to report the correct state on error.
+  * NODE-1020 'family' was added to options to provide high priority for ipv6 addresses (Issue #1518, https://github.com/firej).
+  * Fix require_optional loading of bson-ext.
+  * Ensure no errors are thrown by replset if topology is destroyed before it finished connecting.
+  * NODE-999 SDAM fixes for Mongos and single Server event emitting.
+  * NODE-1014 Set socketTimeout to default to 360 seconds.
+  * NODE-1019 Set keepAlive to 300 seconds or 1/2 of socketTimeout if socketTimeout < keepAlive.
+* Just handle Collection name errors distinctly from general callback errors avoiding double callbacks in Db.collection.
+* NODE-999 SDAM fixes for Mongos and single Server event emitting.
+* NODE-1000 Added guard condition for upload.js checkDone function in case of race condition caused by late arriving chunk write.
+
 2.2.27 2017-05-22
 -----------------
 * Updated mongodb-core to 2.1.11

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

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

@@ -496,7 +496,7 @@ define.classMethod('insertOne', {callback: true, promise:true});
 Collection.prototype.insertMany = function(docs, options, callback) {
   var self = this;
   if(typeof options == 'function') callback = options, options = {};
-  options = options || {ordered:true};
+  options = options ? shallowClone(options) : {ordered:true};
   if(!Array.isArray(docs) && typeof callback == 'function') {
     return callback(MongoError.create({message: 'docs parameter must be an array of documents', driver:true }));
   } else if(!Array.isArray(docs)) {

package/lib/cursor.js

@@ -1003,7 +1003,12 @@ define.classMethod('close', {callback: true, promise:true});
  * @return {Cursor}
  */
 Cursor.prototype.map = function(transform) {
-  this.cursorState.transforms = { doc: transform };
+  if(this.cursorState.transforms && this.cursorState.transforms.doc) {
+    var oldTransform = this.cursorState.transforms.doc;
+    this.cursorState.transforms.doc = function (doc) { return transform(oldTransform(doc)); };
+  } else {
+    this.cursorState.transforms = { doc: transform };
+  }
   return this;
 }
 

package/lib/db.js

@@ -462,6 +462,7 @@ Db.prototype.collection = function(name, options, callback) {
       if(callback) callback(null, collection);
       return collection;
     } catch(err) {
+      // if(err instanceof MongoError && callback) return callback(err);
       if(callback) return callback(err);
       throw err;
     }
@@ -1482,7 +1483,7 @@ Db.prototype.removeUser = function(username, options, callback) {
  * @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) {
-  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.");  
+  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)));
 };
 

package/lib/gridfs/grid_store.js

@@ -427,20 +427,23 @@ var writeFile = function(self, file, callback) {
 
       // Write a chunk
       var writeChunk = function() {
-        fs.read(file, self.chunkSize, offset, 'binary', function(err, data, bytesRead) {
+        // Allocate the buffer
+        var _buffer = new Buffer(self.chunkSize);
+        // Read the file
+        fs.read(file, _buffer, 0, _buffer.length, offset, function(err, bytesRead, data) {
           if(err) return callback(err, self);
 
           offset = offset + bytesRead;
 
           // Create a new chunk for the data
           var chunk = new Chunk(self, {n:index++}, self.writeConcern);
-          chunk.write(data, function(err, chunk) {
+          chunk.write(data.slice(0, bytesRead), function(err, chunk) {
             if(err) return callback(err, self);
 
             chunk.save({}, function(err) {
               if(err) return callback(err, self);
 
-              self.position = self.position + data.length;
+              self.position = self.position + bytesRead;
 
               // Point to current chunk
               self.currentChunk = chunk;

package/lib/gridfs-stream/download.js

@@ -298,15 +298,27 @@ function init(self) {
       return;
     }
 
-    self.s.cursor = self.s.chunks.find({ files_id: doc._id }).sort({ n: 1 });
+    self.s.bytesToSkip = handleStartOption(self, doc, self.s.options);
+
+    var filter = { files_id: doc._id };
+
+    // Currently (MongoDB 3.4.4) skip function does not support the index,
+    // it needs to retrieve all the documents first and then skip them. (CS-25811)
+    // As work around we use $gte on the "n" field.
+    if (self.s.options && self.s.options.start != null){
+      var skip = Math.floor(self.s.options.start / doc.chunkSize);
+      if (skip > 0){
+        filter["n"] = {"$gte": skip};
+      }
+    }
+    self.s.cursor = self.s.chunks.find(filter).sort({ n: 1 });
+
     if (self.s.readPreference) {
       self.s.cursor.setReadPreference(self.s.readPreference);
     }
 
     self.s.expectedEnd = Math.ceil(doc.length / doc.chunkSize);
     self.s.file = doc;
-    self.s.bytesToSkip = handleStartOption(self, doc, self.s.cursor,
-      self.s.options);
     self.s.bytesToTrim = handleEndOption(self, doc, self.s.cursor,
       self.s.options);
     self.emit('file', doc);
@@ -336,11 +348,11 @@ function waitForFile(_this, callback) {
  * @ignore
  */
 
-function handleStartOption(stream, doc, cursor, options) {
+function handleStartOption(stream, doc, options) {
   if (options && options.start != null) {
     if (options.start > doc.length) {
       throw new Error('Stream start (' + options.start + ') must not be ' +
-        'more than the length of the file (' + doc.length +')')
+        'more than the length of the file (' + doc.length +')');
     }
     if (options.start < 0) {
       throw new Error('Stream start (' + options.start + ') must not be ' +
@@ -351,8 +363,6 @@ function handleStartOption(stream, doc, cursor, options) {
         'greater than stream end (' + options.end + ')');
     }
 
-    cursor.skip(Math.floor(options.start / doc.chunkSize));
-
     stream.s.bytesRead = Math.floor(options.start / doc.chunkSize) *
       doc.chunkSize;
     stream.s.expected = Math.floor(options.start / doc.chunkSize);

package/lib/gridfs-stream/upload.js

@@ -33,6 +33,8 @@ function GridFSBucketWriteStream(bucket, filename, options) {
   this.filename = filename;
   this.files = bucket.s._filesCollection;
   this.options = options;
+  // Signals the write is all done
+  this.done = false;
 
   this.id = options.id ? options.id : core.BSON.ObjectId();
   this.chunkSizeBytes = this.options.chunkSizeBytes;
@@ -252,9 +254,13 @@ function checkChunksIndex(_this, callback) {
  */
 
 function checkDone(_this, callback) {
+  if(_this.done) return true;
   if (_this.state.streamEnd &&
       _this.state.outstandingRequests === 0 &&
       !_this.state.errored) {
+    // Set done so we dont' trigger duplicate createFilesDoc
+    _this.done = true;
+    // Create a new files doc
     var filesDoc = createFilesDoc(_this.id, _this.length, _this.chunkSizeBytes,
       _this.md5.digest('hex'), _this.filename, _this.options.contentType,
       _this.options.aliases, _this.options.metadata);
@@ -421,6 +427,7 @@ function doWrite(_this, chunk, encoding, callback) {
         }
         --_this.state.outstandingRequests;
         --outstandingRequests;
+        
         if (!outstandingRequests) {
           _this.emit('drain', doc);
           callback && callback();

package/lib/mongo_client.js

@@ -12,6 +12,7 @@ var parse = require('./url_parser')
   , MongoError = require('mongodb-core').MongoError
   , Db = require('./db')
   , f = require('util').format
+  , assign = require('./utils').assign
   , shallowClone = require('./utils').shallowClone
   , authenticate = require('./authenticate');
 
@@ -30,14 +31,14 @@ var parse = require('./url_parser')
  * });
  */
 var validOptionNames = ['poolSize', 'ssl', 'sslValidate', 'sslCA', 'sslCert',
-  'sslKey', 'sslPass', 'sslCRL', 'autoReconnect', 'noDelay', 'keepAlive', 'connectTimeoutMS',
+  'sslKey', 'sslPass', 'sslCRL', 'autoReconnect', 'noDelay', 'keepAlive', 'connectTimeoutMS', 'family',
   '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'];
 
@@ -100,9 +101,10 @@ function MongoClient() {
    * @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.autoReconnect=true] Enable autoReconnect for single server instances
    * @param {boolean} [options.noDelay=true] TCP Connection no delay
-   * @param {boolean} [options.keepAlive=0] The number of milliseconds to wait before initiating keepAlive on the TCP socket.
+   * @param {number} [options.family=4] Version of IP stack. Defaults to 4.
+   * @param {boolean} [options.keepAlive=30000] The number of milliseconds to wait before initiating keepAlive on the TCP socket.
    * @param {number} [options.connectTimeoutMS=30000] TCP Connection timeout setting
-   * @param {number} [options.socketTimeoutMS=30000] TCP Socket timeout setting
+   * @param {number} [options.socketTimeoutMS=360000] TCP Socket timeout setting
    * @param {number} [options.reconnectTries=30] Server attempt to reconnect #times
    * @param {number} [options.reconnectInterval=1000] Server will wait # milliseconds between retries
    * @param {boolean} [options.ha=true] Control if high availability monitoring runs for Replicaset or Mongos proxies.
@@ -112,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 username 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.
@@ -130,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.
@@ -167,9 +172,10 @@ var define = MongoClient.define = new Define('MongoClient', MongoClient, false);
  * @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.autoReconnect=true] Enable autoReconnect for single server instances
  * @param {boolean} [options.noDelay=true] TCP Connection no delay
- * @param {boolean} [options.keepAlive=0] The number of milliseconds to wait before initiating keepAlive on the TCP socket.
+ * @param {number} [options.family=4] Version of IP stack. Defaults to 4.
+ * @param {boolean} [options.keepAlive=30000] The number of milliseconds to wait before initiating keepAlive on the TCP socket.
  * @param {number} [options.connectTimeoutMS=30000] TCP Connection timeout setting
- * @param {number} [options.socketTimeoutMS=30000] TCP Socket timeout setting
+ * @param {number} [options.socketTimeoutMS=360000] TCP Socket timeout setting
  * @param {number} [options.reconnectTries=30] Server attempt to reconnect #times
  * @param {number} [options.reconnectInterval=1000] Server will wait # milliseconds between retries
  * @param {boolean} [options.ha=true] Control if high availability monitoring runs for Replicaset or Mongos proxies.
@@ -179,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 username 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.
@@ -197,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.
@@ -294,7 +303,7 @@ function translateOptions(options) {
   }
 
   // Set the socket and connection timeouts
-  if(options.socketTimeoutMS == null) options.socketTimeoutMS = 30000;
+  if(options.socketTimeoutMS == null) options.socketTimeoutMS = 360000;
   if(options.connectTimeoutMS == null) options.connectTimeoutMS = 30000;
 
   // Create server instances
@@ -305,6 +314,37 @@ function translateOptions(options) {
   });
 }
 
+//
+// Collect all events in order from SDAM
+//
+function collectEvents(self, db) {
+  var collectedEvents = [];
+
+  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) {
+        collectedEvents.push({
+          event: event, object1: object1, object2: object2
+        });
+      });
+    });
+  }
+
+  return collectedEvents;
+}
+
+//
+// Replay any events due to single server connection switching to Mongos
+//
+function replayEvents(self, events) {
+  for(var i = 0; i < events.length; i++) {
+    self.emit(events[i].event, events[i].object1, events[i].object2);
+  }
+}
+
 function relayEvents(self, db) {
   if(self instanceof MongoClient) {
     var events = ["timeout", "close", 'serverOpening', 'serverDescriptionChanged', 'serverHeartbeatStarted',
@@ -325,7 +365,7 @@ function createReplicaset(self, options, callback) {
   var db = new Db(options.dbName, new ReplSet(servers, options), options);
   // Propegate the events to the client
   relayEvents(self, db);
-  // Open the connection  
+  // Open the connection
   db.open(callback);
 }
 
@@ -336,7 +376,7 @@ function createMongos(self, options, callback) {
   var db = new Db(options.dbName, new Mongos(servers, options), options)
   // Propegate the events to the client
   relayEvents(self, db);
-  // Open the connection  
+  // Open the connection
   db.open(callback);
 }
 
@@ -346,7 +386,7 @@ function createServer(self, options, callback) {
   // Create db instance
   var db = new Db(options.dbName, servers[0], options);
   // Propegate the events to the client
-  relayEvents(self, db);
+  var collectedEvents = collectEvents(self, db);
   // Create Db instance
   db.open(function(err, db) {
     if(err) return callback(err);
@@ -361,6 +401,10 @@ function createServer(self, options, callback) {
       return createMongos(self, options, callback);
     }
 
+    // Fire all the events
+    replayEvents(self, collectedEvents);
+    // Propegate the events to the client
+    relayEvents(self, db);
     // Otherwise callback
     callback(err, db);
   });
@@ -445,9 +489,13 @@ var connect = function(self, url, options, callback) {
   _finalOptions = createUnifiedOptions(_finalOptions, options);
 
   // Check if we have connection and socket timeout set
-  if(_finalOptions.socketTimeoutMS == null) _finalOptions.socketTimeoutMS = 30000;
+  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/mongos.js

@@ -283,9 +283,8 @@ Mongos.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) {
+    var events = ["timeout", "error", "close", 'fullsetup'];
+    events.forEach(function(e) {
       self.s.mongos.removeAllListeners(e);
     });
 
@@ -294,19 +293,8 @@ Mongos.prototype.connect = function(db, _options, callback) {
     self.s.mongos.once('error', errorHandler('error'));
     self.s.mongos.once('close', errorHandler('close'));
 
-    // Set up SDAM listeners
-    self.s.mongos.on('serverDescriptionChanged', relay('serverDescriptionChanged'));
-    self.s.mongos.on('serverHeartbeatStarted', relay('serverHeartbeatStarted'));
-    self.s.mongos.on('serverHeartbeatSucceeded', relay('serverHeartbeatSucceeded'));
-    self.s.mongos.on('serverHeartbeatFailed', relay('serverHeartbeatFailed'));
-    self.s.mongos.on('serverOpening', relay('serverOpening'));
-    self.s.mongos.on('serverClosed', relay('serverClosed'));
-    self.s.mongos.on('topologyOpening', relay('topologyOpening'));
-    self.s.mongos.on('topologyClosed', relay('topologyClosed'));
-    self.s.mongos.on('topologyDescriptionChanged', relay('topologyDescriptionChanged'));
-
     // Set up serverConfig listeners
-    self.s.mongos.on('fullsetup', relay('fullsetup'));
+    self.s.mongos.on('fullsetup', function() { self.emit('fullsetup', self); });
 
     // Emit open event
     self.emit('open', null, self);
@@ -319,6 +307,25 @@ Mongos.prototype.connect = function(db, _options, callback) {
     }
   }
 
+  // Clear out all the current handlers left over
+  var events = ["timeout", "error", "close", 'serverOpening', 'serverDescriptionChanged', 'serverHeartbeatStarted',
+    'serverHeartbeatSucceeded', 'serverHeartbeatFailed', 'serverClosed', 'topologyOpening',
+    'topologyClosed', 'topologyDescriptionChanged'];
+  events.forEach(function(e) {
+    self.s.mongos.removeAllListeners(e);
+  });
+
+  // Set up SDAM listeners
+  self.s.mongos.on('serverDescriptionChanged', relay('serverDescriptionChanged'));
+  self.s.mongos.on('serverHeartbeatStarted', relay('serverHeartbeatStarted'));
+  self.s.mongos.on('serverHeartbeatSucceeded', relay('serverHeartbeatSucceeded'));
+  self.s.mongos.on('serverHeartbeatFailed', relay('serverHeartbeatFailed'));
+  self.s.mongos.on('serverOpening', relay('serverOpening'));
+  self.s.mongos.on('serverClosed', relay('serverClosed'));
+  self.s.mongos.on('topologyOpening', relay('topologyOpening'));
+  self.s.mongos.on('topologyClosed', relay('topologyClosed'));
+  self.s.mongos.on('topologyDescriptionChanged', relay('topologyDescriptionChanged'));
+
   // Set up listeners
   self.s.mongos.once('timeout', connectErrorHandler('timeout'));
   self.s.mongos.once('error', connectErrorHandler('error'));

package/lib/replset.js

@@ -44,7 +44,7 @@ var legalOptionNames = ['ha', 'haInterval', 'replicaSet', 'rs_name', 'secondaryA
   , 'connectWithNoPrimary', 'poolSize', 'ssl', 'checkServerIdentity', 'sslValidate'
   , 'sslCA', 'sslCert', 'sslCRL', 'sslKey', 'sslPass', 'socketOptions', 'bufferMaxEntries'
   , 'store', 'auto_reconnect', 'autoReconnect', 'emitError'
-  , 'keepAlive', 'noDelay', 'connectTimeoutMS', 'socketTimeoutMS', 'strategy', 'debug'
+  , 'keepAlive', 'noDelay', 'connectTimeoutMS', 'socketTimeoutMS', 'strategy', 'debug', 'family'
   , 'loggerLevel', 'logger', 'reconnectTries', 'appname', 'domainsEnabled'
   , 'servername', 'promoteLongs', 'promoteValues', 'promoteBuffers', 'maxStalenessSeconds'];
 
@@ -62,7 +62,7 @@ var release = os.release();
  * @deprecated
  * @param {Server[]} servers A seedlist of servers participating in the replicaset.
  * @param {object} [options=null] Optional settings.
- * @param {booelan} [options.ha=true] Turn on high availability monitoring.
+ * @param {boolean} [options.ha=true] Turn on high availability monitoring.
  * @param {number} [options.haInterval=10000] Time between each replicaset status check.
  * @param {string} [options.replicaSet] The name of the replicaset to connect to.
  * @param {number} [options.secondaryAcceptableLatencyMS=15] Sets the range of servers to pick when using NEAREST (lowest ping ms + the latency fence, ex: range of 1 to (1 + 15) ms)
@@ -321,7 +321,7 @@ ReplSet.prototype.connect = function(db, _options, callback) {
   self.s.replset.on('topologyDescriptionChanged', relay('topologyDescriptionChanged'));
 
   self.s.replset.on('fullsetup', function() {
-    self.emit('fullsetup', null, self);
+    self.emit('fullsetup', self, self);
   });
 
   self.s.replset.on('all', function() {
@@ -335,31 +335,6 @@ ReplSet.prototype.connect = function(db, _options, callback) {
     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);