mongodb 3.0.0 → 3.0.4

package/.eslintrc

@@ -7,7 +7,8 @@
     "mocha": true
   },
   "globals": {
-    "Promise": true
+    "Promise": true,
+    "Set": true
   },
   "parserOptions": {
     "ecmaVersion": 2017

package/CHANGES_3.0.0.md

@@ -101,10 +101,6 @@ MongoClient.connect('mongodb://localhost:27017/test', (err, client) => {
 });
 ```
 
-`Collection.prototype.aggregate` now returns a cursor if a callback is provided. It used to return
-the resulting documents which is the same as calling `cursor.toArray()` on the cursor we now pass to
-the callback.
-
 ## Other Changes
 
 Below are more updates to the driver in the 3.0.0 release.
@@ -177,7 +173,72 @@ in on the options object . Additionally, `find` does not support individual opti
 `limit` as positional parameters. You must either pass in these parameters in the `options` object,
 or add them via `Cursor` methods like `Cursor.prototype.skip`.
 
-### Aggregation
+### `Collection.prototype.aggregate`
+
+`Collection.prototype.aggregate` no longer accepts variadic arguments. While this
+was originally added to improve compatibility with the mongo shell, it has never
+been a documented feature, and has led to more bugs and maintenance burden.
+Pipeline stages are now only accepted as an `Array` of stages as the first argument.
+
+2.x syntax:
+
+```js
+collection.prototype.aggregate(
+  {$match: {a: 1}},
+  {$project: {b: 1, _id: 0}},
+  function (err, result) {
+    ...
+  }
+);
+```
+
+3.x syntax
+
+```js
+collection.prototype.aggregate(
+  [
+    {$match: {a: 1}},
+    {$project: {b: 1, _id: 0}}
+  ],
+  function (err, cursor) {
+    ...
+  }
+);
+```
+
+`Collection.prototype.aggregate` now returns a cursor if a callback is provided. It used to return
+the resulting documents which is the same as calling `cursor.toArray()` on the cursor we now pass to
+the callback.
+
+2.x syntax
+
+```js
+collection.prototype.aggregate(
+  [
+    {$match: {a: 1}},
+    {$project: {b: 1, _id: 0}}
+  ],
+  function (err, result) {
+    console.log(result);
+  }
+);
+```
+
+3.x syntax
+
+```js
+collection.prototype.aggregate(
+  [
+    {$match: {a: 1}},
+    {$project: {b: 1, _id: 0}}
+  ],
+  function (err, cursor) {
+    cursor.toArray(function(err, result) {
+      console.log(result);
+    });
+  }
+);
+```
 
 Support added for `comment` in the aggregation command. Support also added for a `hint` field in the
 aggregation `options`.

package/HISTORY.md

@@ -1,3 +1,60 @@
+<a name="3.0.4"></a>
+## [3.0.4](https://github.com/mongodb/node-mongodb-native/compare/v3.0.2...v3.0.4) (2018-03-05)
+
+
+### Bug Fixes
+
+* **collection:** fix error when calling remove with no args ([#1657](https://github.com/mongodb/node-mongodb-native/issues/1657)) ([4c9b0f8](https://github.com/mongodb/node-mongodb-native/commit/4c9b0f8))
+* **executeOperation:** don't mutate options passed to commands ([934a43a](https://github.com/mongodb/node-mongodb-native/commit/934a43a))
+* **jsdoc:** mark db.collection callback as optional + typo fix ([#1658](https://github.com/mongodb/node-mongodb-native/issues/1658)) ([c519b9b](https://github.com/mongodb/node-mongodb-native/commit/c519b9b))
+* **sessions:** move active session tracking to topology base ([#1665](https://github.com/mongodb/node-mongodb-native/issues/1665)) ([b1f296f](https://github.com/mongodb/node-mongodb-native/commit/b1f296f))
+* **utils:** fixes executeOperation to clean up sessions ([04e6ef6](https://github.com/mongodb/node-mongodb-native/commit/04e6ef6))
+
+
+### Features
+
+* **default-db:** use dbName from uri if none provided ([23b1938](https://github.com/mongodb/node-mongodb-native/commit/23b1938))
+* **mongodb-core:** update to mongodb-core 3.0.4 ([1fdbaa5](https://github.com/mongodb/node-mongodb-native/commit/1fdbaa5))
+
+
+
+<a name="3.0.3"></a>
+## [3.0.3](https://github.com/mongodb/node-mongodb-native/compare/v3.0.2...v3.0.3) (2018-02-23)
+
+
+### Bug Fixes
+
+* **collection:** fix error when calling remove with no args ([#1657](https://github.com/mongodb/node-mongodb-native/issues/1657)) ([4c9b0f8](https://github.com/mongodb/node-mongodb-native/commit/4c9b0f8))
+* **executeOperation:** don't mutate options passed to commands ([934a43a](https://github.com/mongodb/node-mongodb-native/commit/934a43a))
+* **jsdoc:** mark db.collection callback as optional + typo fix ([#1658](https://github.com/mongodb/node-mongodb-native/issues/1658)) ([c519b9b](https://github.com/mongodb/node-mongodb-native/commit/c519b9b))
+* **sessions:** move active session tracking to topology base ([#1665](https://github.com/mongodb/node-mongodb-native/issues/1665)) ([b1f296f](https://github.com/mongodb/node-mongodb-native/commit/b1f296f))
+
+
+
+<a name="3.0.2"></a>
+## [3.0.2](https://github.com/mongodb/node-mongodb-native/compare/v3.0.1...v3.0.2) (2018-01-29)
+
+
+### Bug Fixes
+
+* **collection:** ensure dynamic require of `db` is wrapped in parentheses ([efa78f0](https://github.com/mongodb/node-mongodb-native/commit/efa78f0))
+* **db:** only callback with MongoError NODE-1293 ([#1652](https://github.com/mongodb/node-mongodb-native/issues/1652)) ([45bc722](https://github.com/mongodb/node-mongodb-native/commit/45bc722))
+* **topology base:** allow more than 10 event listeners ([#1630](https://github.com/mongodb/node-mongodb-native/issues/1630)) ([d9fb750](https://github.com/mongodb/node-mongodb-native/commit/d9fb750))
+* **url parser:** preserve auth creds when composing conn string  ([#1640](https://github.com/mongodb/node-mongodb-native/issues/1640)) ([eddca5e](https://github.com/mongodb/node-mongodb-native/commit/eddca5e))
+
+
+### Features
+
+* **bulk:** forward 'checkKeys' option for ordered and unordered bulk operations ([421a6b2](https://github.com/mongodb/node-mongodb-native/commit/421a6b2))
+* **collection:** expose `dbName` property of collection ([6fd05c1](https://github.com/mongodb/node-mongodb-native/commit/6fd05c1))
+
+
+
+<a name="3.0.1"></a>
+## [3.0.1](https://github.com/mongodb/node-mongodb-native/compare/v3.0.0...v3.0.1) (2017-12-24)
+
+* update mongodb-core to 3.0.1
+
 <a name="3.0.0"></a>
 # [3.0.0](https://github.com/mongodb/node-mongodb-native/compare/v3.0.0-rc0...v3.0.0) (2017-12-24)
 

package/README.md

@@ -15,7 +15,7 @@ The official [MongoDB](https://www.mongodb.com/) driver for Node.js. Provides a
 | what          | where                                          |
 |---------------|------------------------------------------------|
 | documentation | http://mongodb.github.io/node-mongodb-native  |
-| api-doc        | http://mongodb.github.io/node-mongodb-native/2.2/api  |
+| api-doc        | http://mongodb.github.io/node-mongodb-native/3.0/api  |
 | source        | https://github.com/mongodb/node-mongodb-native |
 | mongodb       | http://www.mongodb.org                        |
 
@@ -67,11 +67,11 @@ The MongoDB driver depends on several other packages. These are:
 
 The `kerberos` package is a C++ extension that requires a build environment to be installed on your system. You must be able to build Node.js itself in order to compile and install the `kerberos` module. Furthermore, the `kerberos` module requires the MIT Kerberos package to correctly compile on UNIX operating systems. Consult your UNIX operation system package manager for what libraries to install.
 
-**Windows already contains the SSPI API used for Kerberos authentication. However you will need to install a full compiler tool chain using Visual Studio C++ to correctly install the Kerberos extension.**
+**Windows already contains the SSPI API used for Kerberos authentication. However, you will need to install a full compiler tool chain using Visual Studio C++ to correctly install the Kerberos extension.**
 
 ### Diagnosing on UNIX
 
-If you don’t have the build essentials, this module won’t build. In the case of Linux, you will need gcc, g++, Node.js with all the headers and Python. The easiest way to figure out what’s missing is by trying to build the Kerberos project. You can do this by performing the following steps.
+If you don’t have the build-essentials, this module won’t build. In the case of Linux, you will need gcc, g++, Node.js with all the headers and Python. The easiest way to figure out what’s missing is by trying to build the Kerberos project. You can do this by performing the following steps.
 
 ```bash
 git clone https://github.com/mongodb-js/kerberos

package/lib/bulk/ordered.js

@@ -303,7 +303,9 @@ function OrderedBulkOperation(topology, collection, options) {
     bypassDocumentValidation:
       typeof options.bypassDocumentValidation === 'boolean'
         ? options.bypassDocumentValidation
-        : false
+        : false,
+    // check keys
+    checkKeys: typeof options.checkKeys === 'boolean' ? options.checkKeys : true
   };
 }
 
@@ -513,6 +515,11 @@ var executeCommands = function(self, options, callback) {
     finalOptions.bypassDocumentValidation = true;
   }
 
+  // Is the checkKeys option disabled
+  if (self.s.checkKeys === false) {
+    finalOptions.checkKeys = false;
+  }
+
   try {
     if (batch.batchType === common.INSERT) {
       self.s.topology.insert(

package/lib/bulk/unordered.js

@@ -312,7 +312,9 @@ var UnorderedBulkOperation = function(topology, collection, options) {
     bypassDocumentValidation:
       typeof options.bypassDocumentValidation === 'boolean'
         ? options.bypassDocumentValidation
-        : false
+        : false,
+    // check keys
+    checkKeys: typeof options.checkKeys === 'boolean' ? options.checkKeys : true
   };
 };
 
@@ -474,6 +476,11 @@ var executeBatch = function(self, batch, options, callback) {
     finalOptions.bypassDocumentValidation = true;
   }
 
+  // Is the checkKeys option disabled
+  if (self.s.checkKeys === false) {
+    finalOptions.checkKeys = false;
+  }
+
   try {
     if (batch.batchType === common.INSERT) {
       self.s.topology.insert(

package/lib/change_stream.js

@@ -13,7 +13,7 @@ var cursorOptionNames = ['maxAwaitTimeMS', 'collation', 'readPreference'];
  * @param {(Db|Collection)} changeDomain The collection against which to create the change stream
  * @param {Array} pipeline An array of {@link https://docs.mongodb.com/manual/reference/operator/aggregation-pipeline/|aggregation pipeline stages} through which to pass change stream documents
  * @param {object} [options=null] Optional settings
- * @param {string} [options.fullDocument=none] Allowed values: ‘none’, ‘lookup’. When set to ‘lookup’, the change stream will include both a delta describing the changes to the document, as well as a copy of the entire document that was changed from some time after the change occurred.
+ * @param {string} [options.fullDocument='default'] Allowed values: ‘default’, ‘updateLookup’. When set to ‘updateLookup’, the change stream will include both a delta describing the changes to the document, as well as a copy of the entire document that was changed from some time after the change occurred.
  * @param {number} [options.maxAwaitTimeMS] The maximum amount of time for the server to wait on new documents to satisfy a change stream query
  * @param {object} [options.resumeAfter=null] Specifies the logical starting point for the new change stream. This should be the _id field from a previously returned change stream document.
  * @param {number} [options.batchSize=null] The number of documents to return per batch. See {@link https://docs.mongodb.com/manual/reference/command/aggregate|aggregation documentation}.
@@ -335,7 +335,7 @@ var processNewChange = function(self, err, change, callback) {
   // Cache the resume token if it is present. If it is not present return an error.
   if (!change || !change._id) {
     var noResumeTokenError = new Error(
-      'A change stream document has been recieved that lacks a resume token (_id).'
+      'A change stream document has been received that lacks a resume token (_id).'
     );
     if (typeof callback === 'function') return callback(noResumeTokenError, null);
     if (self.listenerCount('error')) return self.emit('error', noResumeTokenError);

package/lib/collection.js

@@ -143,6 +143,13 @@ var Collection = function(db, topology, dbName, name, pkFactory, options) {
 
 var define = (Collection.define = new Define('Collection', Collection, false));
 
+Object.defineProperty(Collection.prototype, 'dbName', {
+  enumerable: true,
+  get: function() {
+    return this.s.dbName;
+  }
+});
+
 Object.defineProperty(Collection.prototype, 'collectionName', {
   enumerable: true,
   get: function() {
@@ -811,6 +818,7 @@ define.classMethod('insert', { callback: true, promise: true });
  * @param {number} [options.wtimeout=null] The write concern timeout.
  * @param {boolean} [options.j=false] Specify a journal write concern.
  * @param {boolean} [options.bypassDocumentValidation=false] Allow driver to bypass schema validation in MongoDB 3.2 or higher.
+ * @param {Array} [options.arrayFilters=null] optional list of array filters referenced in filtered positional operators
  * @param {ClientSession} [options.session] optional session to use for this operation
  * @param {Collection~updateWriteOpCallback} [callback] The command result callback
  * @return {Promise} returns Promise if no callback passed
@@ -929,13 +937,14 @@ define.classMethod('replaceOne', { callback: true, promise: true });
 /**
  * Update multiple documents on MongoDB
  * @method
- * @param {object} filter The Filter used to select the document to update
+ * @param {object} filter The Filter used to select the documents to update
  * @param {object} update The update operations to be applied to the document
  * @param {object} [options=null] Optional settings.
  * @param {boolean} [options.upsert=false] Update operation is an upsert.
  * @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.
+ * @param {Array} [options.arrayFilters=null] optional list of array filters referenced in filtered positional operators
  * @param {ClientSession} [options.session] optional session to use for this operation
  * @param {Collection~updateWriteOpCallback} [callback] The command result callback
  * @return {Promise} returns Promise if no callback passed
@@ -1042,6 +1051,7 @@ var updateDocuments = function(self, selector, document, options, callback) {
  * @param {boolean} [options.multi=false] Update one/all documents with operation.
  * @param {boolean} [options.bypassDocumentValidation=false] Allow driver to bypass schema validation in MongoDB 3.2 or higher.
  * @param {object} [options.collation=null] Specify collation (MongoDB 3.4 or higher) settings for update operation (see 3.4 documentation for available fields).
+ * @param {Array} [options.arrayFilters=null] optional list of array filters referenced in filtered positional operators
  * @param {ClientSession} [options.session] optional session to use for this operation
  * @param {Collection~writeOpCallback} [callback] The command result callback
  * @throws {MongoError}
@@ -1223,6 +1233,9 @@ define.classMethod('removeMany', { callback: true, promise: true });
  * @deprecated use deleteOne, deleteMany or bulkWrite
  */
 Collection.prototype.remove = function(selector, options, callback) {
+  if (typeof options === 'function') (callback = options), (options = {});
+  options = options || {};
+
   // Add ignoreUndfined
   if (this.s.options.ignoreUndefined) {
     options = shallowClone(options);
@@ -1288,6 +1301,13 @@ define.classMethod('save', { callback: true, promise: true });
  * @param {object} result The result object if the command was executed successfully.
  */
 
+/**
+ * The callback format for an aggregation call
+ * @callback Collection~aggregationCallback
+ * @param {MongoError} error An error instance representing the error during the execution.
+ * @param {AggregationCursor} cursor The cursor if the aggregation command was executed successfully.
+ */
+
 /**
  * Fetches the first document that matches the query
  * @method
@@ -1512,12 +1532,8 @@ define.classMethod('isCapped', { callback: true, promise: true });
  * @return {Promise} returns Promise if no callback passed
  */
 Collection.prototype.createIndex = function(fieldOrSpec, options, callback) {
-  var args = Array.prototype.slice.call(arguments, 1);
-  callback = typeof args[args.length - 1] === 'function' ? args.pop() : undefined;
-
-  options = args.length ? args.shift() || {} : {};
-  options = typeof callback === 'function' ? options : callback;
-  options = options == null ? {} : options;
+  if (typeof options === 'function') (callback = options), (options = {});
+  options = options || {};
 
   return executeOperation(this.s.topology, createIndex, [this, fieldOrSpec, options, callback]);
 };
@@ -2384,7 +2400,7 @@ function decorateWithReadConcern(command, self, options) {
  * @param {object} [options.collation=null] Specify collation (MongoDB 3.4 or higher) settings for update operation (see 3.4 documentation for available fields).
  * @param {string} [options.comment] Add a comment to an aggregation command
  * @param {ClientSession} [options.session] optional session to use for this operation
- * @param {Collection~resultCallback} callback The command result callback
+ * @param {Collection~aggregationCallback} callback The command result callback
  * @return {(null|AggregationCursor)}
  */
 Collection.prototype.aggregate = function(pipeline, options, callback) {
@@ -2516,7 +2532,7 @@ define.classMethod('aggregate', { callback: true, promise: false });
  * @since 3.0.0
  * @param {Array} [pipeline=null] An array of {@link https://docs.mongodb.com/manual/reference/operator/aggregation-pipeline/|aggregation pipeline stages} through which to pass change stream documents. This allows for filtering (using $match) and manipulating the change stream documents.
  * @param {object} [options=null] Optional settings
- * @param {string} [options.fullDocument=none] Allowed values: ‘none’, ‘lookup’. When set to ‘lookup’, the change stream will include both a delta describing the changes to the document, as well as a copy of the entire document that was changed from some time after the change occurred.
+ * @param {string} [options.fullDocument='default'] Allowed values: ‘default’, ‘updateLookup’. When set to ‘updateLookup’, the change stream will include both a delta describing the changes to the document, as well as a copy of the entire document that was changed from some time after the change occurred.
  * @param {object} [options.resumeAfter=null] Specifies the logical starting point for the new change stream. This should be the _id field from a previously returned change stream document.
  * @param {number} [options.maxAwaitTimeMS] The maximum amount of time for the server to wait on new documents to satisfy a change stream query
  * @param {number} [options.batchSize=null] The number of documents to return per batch. See {@link https://docs.mongodb.com/manual/reference/command/aggregate|aggregation documentation}.
@@ -2998,11 +3014,10 @@ var mapReduce = function(self, map, reduce, options, callback) {
     if (result.result != null && typeof result.result === 'object') {
       var doc = result.result;
       // Return a collection from another db
-      collection = new require('./db')(
-        doc.db,
-        self.s.db.s.topology,
-        self.s.db.s.options
-      ).collection(doc.collection);
+      var Db = require('./db');
+      collection = new Db(doc.db, self.s.db.s.topology, self.s.db.s.options).collection(
+        doc.collection
+      );
     } else {
       // Create a collection object that wraps the result collection
       collection = self.s.db.collection(result.result);

package/lib/db.js

@@ -393,7 +393,7 @@ var collectionKeys = [
 ];
 
 /**
- * Fetch a specific collection (containing the actual collection information). If the application does not use strict mode you can
+ * Fetch a specific collection (containing the actual collection information). If the application does not use strict mode you
  * can use it without a callback in the following way: `var collection = db.collection('mycollection');`
  *
  * @method
@@ -409,7 +409,7 @@ var collectionKeys = [
  * @param {boolean} [options.strict=false] Returns an error if the collection does not exist
  * @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 {Db~collectionResultCallback} callback The collection result callback
+ * @param {Db~collectionResultCallback} [callback] The collection result callback
  * @return {Collection} return the new Collection instance if not in strict mode
  */
 Db.prototype.collection = function(name, options, callback) {
@@ -445,8 +445,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);
+      if (err instanceof MongoError && callback) return callback(err);
       throw err;
     }
   }
@@ -1043,13 +1042,8 @@ define.classMethod('executeDbAdminCommand', { callback: true, promise: true });
  * @return {Promise} returns Promise if no callback passed
  */
 Db.prototype.createIndex = function(name, fieldOrSpec, options, callback) {
-  var args = Array.prototype.slice.call(arguments, 2);
-  callback = typeof args[args.length - 1] === 'function' ? args.pop() : undefined;
-  options = args.length ? args.shift() || {} : {};
-  options = typeof callback === 'function' ? options : callback;
-  options = options == null ? {} : options;
-  // Shallow clone the options
-  options = shallowClone(options);
+  if (typeof options === 'function') (callback = options), (options = {});
+  options = options ? shallowClone(options) : {};
 
   return executeOperation(this.s.topology, createIndex, [
     this,

package/lib/mongo_client.js

@@ -22,6 +22,22 @@ var parse = require('./url_parser'),
  * @fileOverview The **MongoClient** class is a class that allows for making Connections to MongoDB.
  *
  * @example
+ * // Connect using a MongoClient instance
+ * const MongoClient = require('mongodb').MongoClient;
+ * const test = require('assert');
+ * // Connection url
+ * const url = 'mongodb://localhost:27017';
+ * // Database Name
+ * const dbName = 'test';
+ * // Connect using MongoClient
+ * const mongoClient = new MongoClient(url);
+ * mongoClient.connect(function(err, client) {
+ *   const db = client.db(dbName);
+ *   client.close();
+ * });
+ *
+ * @example
+ * // Connect using the MongoClient.connect static method
  * const MongoClient = require('mongodb').MongoClient;
  * const test = require('assert');
  * // Connection url
@@ -140,7 +156,8 @@ function validOptions(options) {
  * @param {boolean} [options.keepAlive=true] TCP Connection keep alive enabled
  * @param {number} [options.keepAliveInitialDelay=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.family=4] Version of IP stack. Defaults to 4
+ * @param {number} [options.family=null] Version of IP stack. Can be 4, 6 or null (default).
+ * If null, will attempt to connect with IPv6, and will fall back to IPv4 on failure
  * @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
@@ -218,7 +235,7 @@ var define = (MongoClient.define = new Define('MongoClient', MongoClient, false)
  * The callback format for results
  * @callback MongoClient~connectCallback
  * @param {MongoError} error An error instance representing the error during the execution.
- * @param {Db} db The connected database.
+ * @param {MongoClient} client The connected client.
  */
 
 /**
@@ -230,8 +247,7 @@ var define = (MongoClient.define = new Define('MongoClient', MongoClient, false)
  *
  * @method
  * @param {MongoClient~connectCallback} [callback] The command result callback
- * @return {Promise} returns Promise if no callback passed
- * @deprecated MongoClient.connect is deprecated, please use new MongoClient().connect() to connect.
+ * @return {Promise<MongoClient>} returns Promise if no callback passed
  */
 MongoClient.prototype.connect = function(callback) {
   // Validate options object
@@ -311,14 +327,6 @@ MongoClient.prototype.close = function(force, callback) {
   // Remove listeners after emit
   self.removeAllListeners('close');
 
-  // If we have sessions, we want to send a single `endSessions` command for them,
-  // and then individually clean them up.  They will be removed from the internal state
-  // when they emit their `ended` events.
-  if (this.s.sessions.length) {
-    this.topology.endSessions(this.s.sessions);
-    this.s.sessions.forEach(session => session.endSession({ skipCommand: true }));
-  }
-
   // Callback after next event loop tick
   if (typeof callback === 'function')
     return process.nextTick(function() {
@@ -340,7 +348,7 @@ define.classMethod('close', { callback: true, promise: true });
  * You can control these behaviors with the options noListener and returnNonCachedInstance.
  *
  * @method
- * @param {string} name The name of the database we want to use.
+ * @param {string} dbName The name of the database we want to use.
  * @param {object} [options=null] Optional settings.
  * @param {boolean} [options.noListener=false] Do not make the db an event listener to the original connection.
  * @param {boolean} [options.returnNonCachedInstance=false] Control if you want to return a cached instance or have a new one created
@@ -349,6 +357,11 @@ define.classMethod('close', { callback: true, promise: true });
 MongoClient.prototype.db = function(dbName, options) {
   options = options || {};
 
+  // Default to db from connection string if not provided
+  if (!dbName) {
+    dbName = this.s.options.dbName;
+  }
+
   // Copy the options and add out internal override of the not shared flag
   var finalOptions = Object.assign({}, this.s.options, options);
 
@@ -382,7 +395,7 @@ MongoClient.prototype.db = function(dbName, options) {
  * @param {object} [options=null] Optional settings.
  * @param {boolean} [options.noListener=false] Do not make the db an event listener to the original connection.
  * @param {boolean} [options.returnNonCachedInstance=false] Control if you want to return a cached instance or have a new one created
- * @return {Db}
+ * @return {boolean}
  */
 MongoClient.prototype.isConnected = function(options) {
   options = options || {};
@@ -415,7 +428,8 @@ MongoClient.prototype.isConnected = function(options) {
  * @param {boolean} [options.keepAlive=true] TCP Connection keep alive enabled
  * @param {boolean} [options.keepAliveInitialDelay=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.family=4] Version of IP stack. Defaults to 4
+ * @param {number} [options.family=null] Version of IP stack. Can be 4, 6 or null (default).
+ * If null, will attempt to connect with IPv6, and will fall back to IPv4 on failure
  * @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
@@ -458,7 +472,7 @@ MongoClient.prototype.isConnected = function(options) {
  * @param {number} [options.numberOfRetries=5] The number of retries for a tailable cursor
  * @param {boolean} [options.auto_reconnect=true] Enable auto reconnecting for single server instances
  * @param {MongoClient~connectCallback} [callback] The command result callback
- * @return {Promise} returns Promise if no callback passed
+ * @return {Promise<MongoClient>} returns Promise if no callback passed
  */
 MongoClient.connect = function(url, options, callback) {
   var args = Array.prototype.slice.call(arguments, 1);
@@ -467,9 +481,9 @@ MongoClient.connect = function(url, options, callback) {
   options = options || {};
 
   // Create client
-  var mongoclient = new MongoClient(url, options);
+  var mongoClient = new MongoClient(url, options);
   // Execute the connect method
-  return mongoclient.connect(callback);
+  return mongoClient.connect(callback);
 };
 
 define.staticMethod('connect', { callback: true, promise: true });
@@ -478,8 +492,7 @@ define.staticMethod('connect', { callback: true, promise: true });
  * Starts a new session on the server
  *
  * @param {object} [options] optional settings for a driver session
- * @param {MongoClient~sessionCallback} [callback] The callback called with a newly establish session, or an error if one occurred
- * @return {Promise} if no callback is specified, a promise will be returned for the newly established session
+ * @return {ClientSession} the newly established session
  */
 MongoClient.prototype.startSession = function(options) {
   options = options || {};
@@ -491,13 +504,7 @@ MongoClient.prototype.startSession = function(options) {
     throw new MongoError('Current topology does not support sessions');
   }
 
-  const session = this.topology.startSession(options);
-  session.once('ended', () => {
-    this.s.sessions = this.s.sessions.filter(s => s.equals(session));
-  });
-
-  this.s.sessions.push(session);
-  return session;
+  return this.topology.startSession(options);
 };
 
 var mergeOptions = function(target, source, flatten) {

package/lib/topologies/mongos.js

@@ -190,6 +190,8 @@ class Mongos extends TopologyBase {
       options: options,
       // Server Session Pool
       sessionPool: null,
+      // Active client sessions
+      sessions: [],
       // Promise library
       promiseLibrary: options.promiseLibrary || Promise
     };

package/lib/topologies/replset.js

@@ -206,6 +206,8 @@ class ReplSet extends TopologyBase {
       options: options,
       // Server Session Pool
       sessionPool: null,
+      // Active client sessions
+      sessions: [],
       // Promise library
       promiseLibrary: options.promiseLibrary || Promise
     };
@@ -371,22 +373,9 @@ class ReplSet extends TopologyBase {
   }
 
   close(forceClosed) {
-    var self = this;
-    // Call destroy on the topology
-    this.s.coreTopology.destroy({
-      force: typeof forceClosed === 'boolean' ? forceClosed : false
-    });
-
-    // We need to wash out all stored processes
-    if (forceClosed === true) {
-      this.s.storeOptions.force = forceClosed;
-      this.s.store.flush();
-    }
+    super.close(forceClosed);
 
-    var events = ['timeout', 'error', 'close', 'joined', 'left'];
-    events.forEach(function(e) {
-      self.removeAllListeners(e);
-    });
+    ['timeout', 'error', 'close', 'joined', 'left'].forEach(e => this.removeAllListeners(e));
   }
 }
 

package/lib/topologies/server.js

@@ -198,6 +198,8 @@ class Server extends TopologyBase {
       options: options,
       // Server Session Pool
       sessionPool: null,
+      // Active client sessions
+      sessions: [],
       // Promise library
       promiseLibrary: promiseLibrary || Promise
     };

package/lib/topologies/topology_base.js

@@ -280,6 +280,8 @@ class TopologyBase extends EventEmitter {
       },
       platform: nodejsversion
     };
+
+    this.setMaxListeners(Infinity);
   }
 
   // Sessions related methods
@@ -288,7 +290,13 @@ class TopologyBase extends EventEmitter {
   }
 
   startSession(options) {
-    return new ClientSession(this, this.s.sessionPool, options);
+    const session = new ClientSession(this, this.s.sessionPool, options);
+    session.once('ended', () => {
+      this.s.sessions = this.s.sessions.filter(s => !s.equals(session));
+    });
+
+    this.s.sessions.push(session);
+    return session;
   }
 
   endSessions(sessions, callback) {
@@ -386,6 +394,18 @@ class TopologyBase extends EventEmitter {
   }
 
   close(forceClosed) {
+    // If we have sessions, we want to send a single `endSessions` command for them,
+    // and then individually clean them up.  They will be removed from the internal state
+    // when they emit their `ended` events.
+    if (this.s.sessions.length) {
+      this.endSessions(this.s.sessions.map(session => session.id));
+      this.s.sessions.forEach(session => session.endSession({ skipCommand: true }));
+    }
+
+    if (this.s.sessionPool) {
+      this.s.sessionPool.endAllPooledSessions();
+    }
+
     this.s.coreTopology.destroy({
       force: typeof forceClosed === 'boolean' ? forceClosed : false
     });