mongodb 3.0.4 → 3.0.8

package/lib/mongo_client.js

@@ -1,22 +1,21 @@
 'use strict';
 
-var parse = require('./url_parser'),
-  Server = require('./topologies/server'),
-  Mongos = require('./topologies/mongos'),
-  ReplSet = require('./topologies/replset'),
-  EventEmitter = require('events').EventEmitter,
-  inherits = require('util').inherits,
-  Define = require('./metadata'),
-  ReadPreference = require('mongodb-core').ReadPreference,
-  Logger = require('mongodb-core').Logger,
-  MongoError = require('mongodb-core').MongoError,
-  handleCallback = require('./utils').handleCallback,
-  Db = require('./db'),
-  f = require('util').format,
-  shallowClone = require('./utils').shallowClone,
-  authenticate = require('./authenticate'),
-  ServerSessionPool = require('mongodb-core').Sessions.ServerSessionPool,
-  executeOperation = require('./utils').executeOperation;
+const parse = require('./url_parser');
+const Server = require('./topologies/server');
+const Mongos = require('./topologies/mongos');
+const ReplSet = require('./topologies/replset');
+const EventEmitter = require('events').EventEmitter;
+const inherits = require('util').inherits;
+const ReadPreference = require('mongodb-core').ReadPreference;
+const Logger = require('mongodb-core').Logger;
+const MongoError = require('mongodb-core').MongoError;
+const handleCallback = require('./utils').handleCallback;
+const Db = require('./db');
+const f = require('util').format;
+const shallowClone = require('./utils').shallowClone;
+const authenticate = require('./authenticate');
+const ServerSessionPool = require('mongodb-core').Sessions.ServerSessionPool;
+const executeOperation = require('./utils').executeOperation;
 
 /**
  * @fileOverview The **MongoClient** class is a class that allows for making Connections to MongoDB.
@@ -106,7 +105,8 @@ var validOptionNames = [
   'readPreferenceTags',
   'numberOfRetries',
   'auto_reconnect',
-  'minSize'
+  'minSize',
+  'monitorCommands'
 ];
 
 var ignoreOptionNames = ['native_parser'];
@@ -199,11 +199,13 @@ function validOptions(options) {
  * @param {array} [options.readPreferenceTags=null] Read preference tags
  * @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 {boolean} [options.monitorCommands=false] Enable command monitoring for this client
+ * @param {number} [options.minSize] If present, the connection pool will be initialized with minSize connections, and will never dip below minSize connections
  * @param {MongoClient~connectCallback} [callback] The command result callback
  * @return {MongoClient} a MongoClient instance
  */
 function MongoClient(url, options) {
-  if (!(this instanceof MongoClient)) return new MongoClient();
+  if (!(this instanceof MongoClient)) return new MongoClient(url, options);
 
   // Set up event emitter
   EventEmitter.call(this);
@@ -229,8 +231,6 @@ function MongoClient(url, options) {
  */
 inherits(MongoClient, EventEmitter);
 
-var define = (MongoClient.define = new Define('MongoClient', MongoClient, false));
-
 /**
  * The callback format for results
  * @callback MongoClient~connectCallback
@@ -272,8 +272,6 @@ const connectOp = (self, err, callback) => {
   });
 };
 
-define.classMethod('close', { callback: true, promise: true, returns: [MongoClient] });
-
 /**
  * Logout user from server, fire off on all connections and remove all auth info
  * @method
@@ -301,8 +299,6 @@ const logout = (self, dbName, callback) => {
   });
 };
 
-define.classMethod('logout', { callback: true, promise: true });
-
 /**
  * Close the db and its underlying connections
  * @method
@@ -313,7 +309,8 @@ define.classMethod('logout', { callback: true, promise: true });
 MongoClient.prototype.close = function(force, callback) {
   var self = this;
   if (typeof force === 'function') (callback = force), (force = false);
-  // Close the topologu connection
+
+  // Close the topology connection
   this.topology.close(force);
 
   // Emit close event
@@ -339,8 +336,6 @@ MongoClient.prototype.close = function(force, callback) {
   });
 };
 
-define.classMethod('close', { callback: true, promise: true });
-
 /**
  * Create a new Db instance sharing the current socket connections. Be aware that the new db instances are
  * related in a parent-child relationship to the original instance so that events are correctly emitted on child
@@ -471,6 +466,7 @@ MongoClient.prototype.isConnected = function(options) {
  * @param {array} [options.readPreferenceTags=null] Read preference tags
  * @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 {number} [options.minSize] If present, the connection pool will be initialized with minSize connections, and will never dip below minSize connections
  * @param {MongoClient~connectCallback} [callback] The command result callback
  * @return {Promise<MongoClient>} returns Promise if no callback passed
  */
@@ -486,8 +482,6 @@ MongoClient.connect = function(url, options, callback) {
   return mongoClient.connect(callback);
 };
 
-define.staticMethod('connect', { callback: true, promise: true });
-
 /**
  * Starts a new session on the server
  *
@@ -495,7 +489,7 @@ define.staticMethod('connect', { callback: true, promise: true });
  * @return {ClientSession} the newly established session
  */
 MongoClient.prototype.startSession = function(options) {
-  options = options || {};
+  options = Object.assign({ explicit: true }, options);
   if (!this.topology) {
     throw new MongoError('Must connect to a server before calling this method');
   }
@@ -594,6 +588,9 @@ var events = [
   'topologyOpening',
   'topologyClosed',
   'topologyDescriptionChanged',
+  'commandStarted',
+  'commandSucceeded',
+  'commandFailed',
   'joined',
   'left',
   'ping',
@@ -652,11 +649,15 @@ function relayEvents(self, topology) {
     'topologyOpening',
     'topologyClosed',
     'topologyDescriptionChanged',
+    'commandStarted',
+    'commandSucceeded',
+    'commandFailed',
     'joined',
     'left',
     'ping',
     'ha'
   ];
+
   events.forEach(function(event) {
     topology.on(event, function(object1, object2) {
       self.emit(event, object1, object2);
@@ -684,6 +685,7 @@ function createServer(self, options, callback) {
     if (err) return callback(err);
     // Clear out all the collected event listeners
     clearAllEvents(servers[0]);
+
     // Relay all the events
     relayEvents(self, servers[0]);
     // Add listeners
@@ -854,6 +856,10 @@ var connect = function(self, url, options, callback) {
 
     // Add listeners
     addListeners(self, url);
+
+    // Propagate the events to the client
+    relayEvents(self, url);
+
     // Connect
     return url.connect(
       options,

package/lib/topologies/mongos.js

@@ -1,19 +1,15 @@
 'use strict';
 
-var ServerCapabilities = require('./topology_base').ServerCapabilities,
-  TopologyBase = require('./topology_base').TopologyBase,
-  MongoError = require('mongodb-core').MongoError,
-  CMongos = require('mongodb-core').Mongos,
-  Cursor = require('../cursor'),
-  AggregationCursor = require('../aggregation_cursor'),
-  CommandCursor = require('../command_cursor'),
-  Define = require('../metadata'),
-  Server = require('./server'),
-  Store = require('./topology_base').Store,
-  MAX_JS_INT = require('../utils').MAX_JS_INT,
-  translateOptions = require('../utils').translateOptions,
-  filterOptions = require('../utils').filterOptions,
-  mergeOptions = require('../utils').mergeOptions;
+const TopologyBase = require('./topology_base').TopologyBase;
+const MongoError = require('mongodb-core').MongoError;
+const CMongos = require('mongodb-core').Mongos;
+const Cursor = require('../cursor');
+const Server = require('./server');
+const Store = require('./topology_base').Store;
+const MAX_JS_INT = require('../utils').MAX_JS_INT;
+const translateOptions = require('../utils').translateOptions;
+const filterOptions = require('../utils').filterOptions;
+const mergeOptions = require('../utils').mergeOptions;
 
 /**
  * @fileOverview The **Mongos** class is a class that represents a Mongos Proxy topology and is
@@ -58,7 +54,8 @@ var legalOptionNames = [
   'promoteLongs',
   'promoteValues',
   'promoteBuffers',
-  'promiseLibrary'
+  'promiseLibrary',
+  'monitorCommands'
 ];
 
 /**
@@ -89,6 +86,7 @@ var legalOptionNames = [
  * @param {number} [options.socketOptions.connectTimeoutMS=0] TCP Connection timeout setting
  * @param {number} [options.socketOptions.socketTimeoutMS=0] TCP Socket timeout setting
  * @param {boolean} [options.domainsEnabled=false] Enable the wrapping of the callback in the current domain, disabled by default to avoid perf hit.
+ * @param {boolean} [options.monitorCommands=false] Enable command monitoring for this topology
  * @fires Mongos#connect
  * @fires Mongos#ha
  * @fires Mongos#joined
@@ -99,6 +97,9 @@ var legalOptionNames = [
  * @fires Mongos#error
  * @fires Mongos#timeout
  * @fires Mongos#parseError
+ * @fires Mongos#commandStarted
+ * @fires Mongos#commandSucceeded
+ * @fires Mongos#commandFailed
  * @property {string} parserType the parser type used (c++ or js).
  * @return {Mongos} a Mongos instance.
  */
@@ -149,7 +150,9 @@ class Mongos extends TopologyBase {
         cursorFactory: Cursor,
         reconnect: reconnect,
         emitError: typeof options.emitError === 'boolean' ? options.emitError : true,
-        size: typeof options.poolSize === 'number' ? options.poolSize : 5
+        size: typeof options.poolSize === 'number' ? options.poolSize : 5,
+        monitorCommands:
+          typeof options.monitorCommands === 'boolean' ? options.monitorCommands : false
       }
     );
 
@@ -300,7 +303,10 @@ class Mongos extends TopologyBase {
       'serverClosed',
       'topologyOpening',
       'topologyClosed',
-      'topologyDescriptionChanged'
+      'topologyDescriptionChanged',
+      'commandStarted',
+      'commandSucceeded',
+      'commandFailed'
     ];
     events.forEach(function(e) {
       self.s.coreTopology.removeAllListeners(e);
@@ -316,6 +322,9 @@ class Mongos extends TopologyBase {
     self.s.coreTopology.on('topologyOpening', relay('topologyOpening'));
     self.s.coreTopology.on('topologyClosed', relay('topologyClosed'));
     self.s.coreTopology.on('topologyDescriptionChanged', relay('topologyDescriptionChanged'));
+    self.s.coreTopology.on('commandStarted', relay('commandStarted'));
+    self.s.coreTopology.on('commandSucceeded', relay('commandSucceeded'));
+    self.s.coreTopology.on('commandFailed', relay('commandFailed'));
 
     // Set up listeners
     self.s.coreTopology.once('timeout', connectErrorHandler('timeout'));
@@ -341,30 +350,6 @@ Object.defineProperty(Mongos.prototype, 'haInterval', {
   }
 });
 
-const define = (Mongos.define = new Define('Mongos', Mongos, false));
-define.classMethod('capabilities', {
-  callback: false,
-  promise: false,
-  returns: [ServerCapabilities]
-});
-
-define.classMethod('command', { callback: true, promise: false });
-define.classMethod('insert', { callback: true, promise: false });
-define.classMethod('update', { callback: true, promise: false });
-define.classMethod('remove', { callback: true, promise: false });
-define.classMethod('isConnected', { callback: false, promise: false, returns: [Boolean] });
-define.classMethod('isDestroyed', { callback: false, promise: false, returns: [Boolean] });
-define.classMethod('cursor', {
-  callback: false,
-  promise: false,
-  returns: [Cursor, AggregationCursor, CommandCursor]
-});
-
-define.classMethod('close', { callback: false, promise: false });
-define.classMethod('auth', { callback: true, promise: false });
-define.classMethod('logout', { callback: true, promise: false });
-define.classMethod('connections', { callback: false, promise: false, returns: [Array] });
-
 /**
  * A mongos connect event, used to verify that the connection is up and running
  *
@@ -443,4 +428,25 @@ define.classMethod('connections', { callback: false, promise: false, returns: [A
  * @type {object}
  */
 
+/**
+ * An event emitted indicating a command was started, if command monitoring is enabled
+ *
+ * @event Mongos#commandStarted
+ * @type {object}
+ */
+
+/**
+ * An event emitted indicating a command succeeded, if command monitoring is enabled
+ *
+ * @event Mongos#commandSucceeded
+ * @type {object}
+ */
+
+/**
+ * An event emitted indicating a command failed, if command monitoring is enabled
+ *
+ * @event Mongos#commandFailed
+ * @type {object}
+ */
+
 module.exports = Mongos;

package/lib/topologies/replset.js

@@ -1,19 +1,15 @@
 'use strict';
 
-var Server = require('./server'),
-  Cursor = require('../cursor'),
-  AggregationCursor = require('../aggregation_cursor'),
-  CommandCursor = require('../command_cursor'),
-  MongoError = require('mongodb-core').MongoError,
-  ServerCapabilities = require('./topology_base').ServerCapabilities,
-  TopologyBase = require('./topology_base').TopologyBase,
-  Store = require('./topology_base').Store,
-  Define = require('../metadata'),
-  CReplSet = require('mongodb-core').ReplSet,
-  MAX_JS_INT = require('../utils').MAX_JS_INT,
-  translateOptions = require('../utils').translateOptions,
-  filterOptions = require('../utils').filterOptions,
-  mergeOptions = require('../utils').mergeOptions;
+const Server = require('./server');
+const Cursor = require('../cursor');
+const MongoError = require('mongodb-core').MongoError;
+const TopologyBase = require('./topology_base').TopologyBase;
+const Store = require('./topology_base').Store;
+const CReplSet = require('mongodb-core').ReplSet;
+const MAX_JS_INT = require('../utils').MAX_JS_INT;
+const translateOptions = require('../utils').translateOptions;
+const filterOptions = require('../utils').filterOptions;
+const mergeOptions = require('../utils').mergeOptions;
 
 /**
  * @fileOverview The **ReplSet** class is a class that represents a Replicaset topology and is
@@ -66,7 +62,8 @@ var legalOptionNames = [
   'promoteBuffers',
   'maxStalenessSeconds',
   'promiseLibrary',
-  'minSize'
+  'minSize',
+  'monitorCommands'
 ];
 
 /**
@@ -100,6 +97,7 @@ var legalOptionNames = [
  * @param {number} [options.socketOptions.socketTimeoutMS=0] TCP Socket timeout setting
  * @param {boolean} [options.domainsEnabled=false] Enable the wrapping of the callback in the current domain, disabled by default to avoid perf hit.
  * @param {number} [options.maxStalenessSeconds=undefined] The max staleness to secondary reads (values under 10 seconds cannot be guaranteed);
+ * @param {boolean} [options.monitorCommands=false] Enable command monitoring for this topology
  * @fires ReplSet#connect
  * @fires ReplSet#ha
  * @fires ReplSet#joined
@@ -110,6 +108,9 @@ var legalOptionNames = [
  * @fires ReplSet#error
  * @fires ReplSet#timeout
  * @fires ReplSet#parseError
+ * @fires ReplSet#commandStarted
+ * @fires ReplSet#commandSucceeded
+ * @fires ReplSet#commandFailed
  * @property {string} parserType the parser type used (c++ or js).
  * @return {ReplSet} a ReplSet instance.
  */
@@ -156,7 +157,9 @@ class ReplSet extends TopologyBase {
         cursorFactory: Cursor,
         reconnect: false,
         emitError: typeof options.emitError === 'boolean' ? options.emitError : true,
-        size: typeof options.poolSize === 'number' ? options.poolSize : 5
+        size: typeof options.poolSize === 'number' ? options.poolSize : 5,
+        monitorCommands:
+          typeof options.monitorCommands === 'boolean' ? options.monitorCommands : false
       }
     );
 
@@ -260,6 +263,9 @@ class ReplSet extends TopologyBase {
       'topologyOpening',
       'topologyClosed',
       'topologyDescriptionChanged',
+      'commandStarted',
+      'commandSucceeded',
+      'commandFailed',
       'joined',
       'left',
       'ping',
@@ -310,6 +316,9 @@ class ReplSet extends TopologyBase {
     self.s.coreTopology.on('topologyOpening', relay('topologyOpening'));
     self.s.coreTopology.on('topologyClosed', relay('topologyClosed'));
     self.s.coreTopology.on('topologyDescriptionChanged', relay('topologyDescriptionChanged'));
+    self.s.coreTopology.on('commandStarted', relay('commandStarted'));
+    self.s.coreTopology.on('commandSucceeded', relay('commandSucceeded'));
+    self.s.coreTopology.on('commandFailed', relay('commandFailed'));
 
     self.s.coreTopology.on('fullsetup', function() {
       self.emit('fullsetup', self, self);
@@ -386,29 +395,6 @@ Object.defineProperty(ReplSet.prototype, 'haInterval', {
   }
 });
 
-const define = (ReplSet.define = new Define('ReplSet', ReplSet, false));
-define.classMethod('capabilities', {
-  callback: false,
-  promise: false,
-  returns: [ServerCapabilities]
-});
-
-define.classMethod('command', { callback: true, promise: false });
-define.classMethod('insert', { callback: true, promise: false });
-define.classMethod('update', { callback: true, promise: false });
-define.classMethod('remove', { callback: true, promise: false });
-define.classMethod('isConnected', { callback: false, promise: false, returns: [Boolean] });
-define.classMethod('cursor', {
-  callback: false,
-  promise: false,
-  returns: [Cursor, AggregationCursor, CommandCursor]
-});
-
-define.classMethod('close', { callback: false, promise: false });
-define.classMethod('auth', { callback: true, promise: false });
-define.classMethod('logout', { callback: true, promise: false });
-define.classMethod('connections', { callback: false, promise: false, returns: [Array] });
-
 /**
  * A replset connect event, used to verify that the connection is up and running
  *
@@ -487,4 +473,25 @@ define.classMethod('connections', { callback: false, promise: false, returns: [A
  * @type {object}
  */
 
+/**
+ * An event emitted indicating a command was started, if command monitoring is enabled
+ *
+ * @event ReplSet#commandStarted
+ * @type {object}
+ */
+
+/**
+ * An event emitted indicating a command succeeded, if command monitoring is enabled
+ *
+ * @event ReplSet#commandSucceeded
+ * @type {object}
+ */
+
+/**
+ * An event emitted indicating a command failed, if command monitoring is enabled
+ *
+ * @event ReplSet#commandFailed
+ * @type {object}
+ */
+
 module.exports = ReplSet;

package/lib/topologies/server.js

@@ -1,18 +1,14 @@
 'use strict';
 
-var CServer = require('mongodb-core').Server,
-  Cursor = require('../cursor'),
-  AggregationCursor = require('../aggregation_cursor'),
-  CommandCursor = require('../command_cursor'),
-  ServerCapabilities = require('./topology_base').ServerCapabilities,
-  TopologyBase = require('./topology_base').TopologyBase,
-  Store = require('./topology_base').Store,
-  Define = require('../metadata'),
-  MongoError = require('mongodb-core').MongoError,
-  MAX_JS_INT = require('../utils').MAX_JS_INT,
-  translateOptions = require('../utils').translateOptions,
-  filterOptions = require('../utils').filterOptions,
-  mergeOptions = require('../utils').mergeOptions;
+const CServer = require('mongodb-core').Server;
+const Cursor = require('../cursor');
+const TopologyBase = require('./topology_base').TopologyBase;
+const Store = require('./topology_base').Store;
+const MongoError = require('mongodb-core').MongoError;
+const MAX_JS_INT = require('../utils').MAX_JS_INT;
+const translateOptions = require('../utils').translateOptions;
+const filterOptions = require('../utils').filterOptions;
+const mergeOptions = require('../utils').mergeOptions;
 
 /**
  * @fileOverview The **Server** class is a class that represents a single server topology and is
@@ -61,7 +57,8 @@ var legalOptionNames = [
   'promoteValues',
   'promoteBuffers',
   'compression',
-  'promiseLibrary'
+  'promiseLibrary',
+  'monitorCommands'
 ];
 
 /**
@@ -95,12 +92,16 @@ var legalOptionNames = [
  * @param {number} [options.monitoring=true] Triggers the server instance to call ismaster
  * @param {number} [options.haInterval=10000] The interval of calling ismaster when monitoring is enabled.
  * @param {boolean} [options.domainsEnabled=false] Enable the wrapping of the callback in the current domain, disabled by default to avoid perf hit.
+ * @param {boolean} [options.monitorCommands=false] Enable command monitoring for this topology
  * @fires Server#connect
  * @fires Server#close
  * @fires Server#error
  * @fires Server#timeout
  * @fires Server#parseError
  * @fires Server#reconnect
+ * @fires Server#commandStarted
+ * @fires Server#commandSucceeded
+ * @fires Server#commandFailed
  * @property {string} parserType the parser type used (c++ or js).
  * @return {Server} a Server instance.
  */
@@ -149,7 +150,9 @@ class Server extends TopologyBase {
         cursorFactory: Cursor,
         reconnect: reconnect,
         emitError: typeof options.emitError === 'boolean' ? options.emitError : true,
-        size: typeof options.poolSize === 'number' ? options.poolSize : 5
+        size: typeof options.poolSize === 'number' ? options.poolSize : 5,
+        monitorCommands:
+          typeof options.monitorCommands === 'boolean' ? options.monitorCommands : false
       }
     );
 
@@ -321,7 +324,10 @@ class Server extends TopologyBase {
       'serverClosed',
       'topologyOpening',
       'topologyClosed',
-      'topologyDescriptionChanged'
+      'topologyDescriptionChanged',
+      'commandStarted',
+      'commandSucceeded',
+      'commandFailed'
     ].forEach(function(e) {
       self.s.coreTopology.removeAllListeners(e);
     });
@@ -345,6 +351,9 @@ class Server extends TopologyBase {
     self.s.coreTopology.on('topologyOpening', relay('topologyOpening'));
     self.s.coreTopology.on('topologyClosed', relay('topologyClosed'));
     self.s.coreTopology.on('topologyDescriptionChanged', relay('topologyDescriptionChanged'));
+    self.s.coreTopology.on('commandStarted', relay('commandStarted'));
+    self.s.coreTopology.on('commandSucceeded', relay('commandSucceeded'));
+    self.s.coreTopology.on('commandFailed', relay('commandFailed'));
     self.s.coreTopology.on('attemptReconnect', relay('attemptReconnect'));
     self.s.coreTopology.on('monitoring', relay('monitoring'));
 
@@ -381,30 +390,6 @@ Object.defineProperty(Server.prototype, 'port', {
   }
 });
 
-const define = (Server.define = new Define('Server', Server, false));
-define.classMethod('capabilities', {
-  callback: false,
-  promise: false,
-  returns: [ServerCapabilities]
-});
-
-define.classMethod('command', { callback: true, promise: false });
-define.classMethod('insert', { callback: true, promise: false });
-define.classMethod('update', { callback: true, promise: false });
-define.classMethod('remove', { callback: true, promise: false });
-define.classMethod('isConnected', { callback: false, promise: false, returns: [Boolean] });
-define.classMethod('isDestroyed', { callback: false, promise: false, returns: [Boolean] });
-define.classMethod('cursor', {
-  callback: false,
-  promise: false,
-  returns: [Cursor, AggregationCursor, CommandCursor]
-});
-
-define.classMethod('close', { callback: false, promise: false });
-define.classMethod('auth', { callback: true, promise: false });
-define.classMethod('logout', { callback: true, promise: false });
-define.classMethod('connections', { callback: false, promise: false, returns: [Array] });
-
 /**
  * Server connect event
  *
@@ -447,4 +432,25 @@ define.classMethod('connections', { callback: false, promise: false, returns: [A
  * @type {object}
  */
 
+/**
+ * An event emitted indicating a command was started, if command monitoring is enabled
+ *
+ * @event Server#commandStarted
+ * @type {object}
+ */
+
+/**
+ * An event emitted indicating a command succeeded, if command monitoring is enabled
+ *
+ * @event Server#commandSucceeded
+ * @type {object}
+ */
+
+/**
+ * An event emitted indicating a command failed, if command monitoring is enabled
+ *
+ * @event Server#commandFailed
+ * @type {object}
+ */
+
 module.exports = Server;

package/lib/topologies/topology_base.js

@@ -394,11 +394,9 @@ 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 we have sessions, we want to individually move them to the session pool,
+    // and then send a single endSessions call.
     if (this.s.sessions.length) {
-      this.endSessions(this.s.sessions.map(session => session.id));
       this.s.sessions.forEach(session => session.endSession({ skipCommand: true }));
     }
 

package/lib/url_parser.js

@@ -63,6 +63,16 @@ module.exports = function(url, options, callback) {
     let connectionString = connectionStrings.join(',') + '/';
     let connectionStringOptions = [];
 
+    // Add the default database if needed
+    if (result.path) {
+      let defaultDb = result.path.slice(1);
+      if (defaultDb.indexOf('?') !== -1) {
+        defaultDb = defaultDb.slice(0, defaultDb.indexOf('?'));
+      }
+
+      connectionString += defaultDb;
+    }
+
     // Default to SSL true
     if (!options.ssl && !result.search) {
       connectionStringOptions.push('ssl=true');