mongodb 3.6.5 → 3.6.9

package/HISTORY.md

@@ -2,6 +2,47 @@
 
 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
 
+### [3.6.9](https://github.com/mongodb/node-mongodb-native/compare/v3.6.8...v3.6.9) (2021-05-26)
+
+
+### Bug Fixes
+
+* **NODE-3309:** remove redundant iteration of bulk write result ([#2815](https://github.com/mongodb/node-mongodb-native/issues/2815)) ([fac9610](https://github.com/mongodb/node-mongodb-native/commit/fac961086eafa0f7437576fd6af900e1f9fe22ed))
+* fix url parsing for a mongodb+srv url that has commas in the database name ([#2789](https://github.com/mongodb/node-mongodb-native/issues/2789)) ([58c4e69](https://github.com/mongodb/node-mongodb-native/commit/58c4e693cc3a717254144d5f9bdddd8414217e97))
+
+### [3.6.8](https://github.com/mongodb/node-mongodb-native/compare/v3.6.7...v3.6.8) (2021-05-21)
+
+
+### Bug Fixes
+
+* **cmap:** undo flipping of `beforeHandshake` flag for timeout errors ([#2813](https://github.com/mongodb/node-mongodb-native/issues/2813)) ([6e3bab3](https://github.com/mongodb/node-mongodb-native/commit/6e3bab32204ea905ab9b949edccb68556b50d382))
+
+### [3.6.7](https://github.com/mongodb/node-mongodb-native/compare/v3.6.6...v3.6.7) (2021-05-18)
+
+
+### Bug Fixes
+
+* **docs:** removing incorrect apm docs ([#2793](https://github.com/mongodb/node-mongodb-native/issues/2793)) ([971259a](https://github.com/mongodb/node-mongodb-native/commit/971259a868a8018e90ebc2f28d151eb7af3dd50a))
+* **NODE-3173:** Preserve sort key order for numeric string keys ([#2790](https://github.com/mongodb/node-mongodb-native/issues/2790)) ([730f43a](https://github.com/mongodb/node-mongodb-native/commit/730f43af6d9e53603af998353b720d8161426d8c))
+* **NODE-3176:** handle errors from MessageStream ([#2774](https://github.com/mongodb/node-mongodb-native/issues/2774)) ([f1afcc4](https://github.com/mongodb/node-mongodb-native/commit/f1afcc4efbc41ce436812a6bfa22843e939ab5cf))
+* **NODE-3192:** check clusterTime is defined before access ([#2806](https://github.com/mongodb/node-mongodb-native/issues/2806)) ([6ceace6](https://github.com/mongodb/node-mongodb-native/commit/6ceace6b245c42b8498fb1b13e7c37a97a46946d))
+* **NODE-3252:** state transistion from DISCONNECTED ([#2807](https://github.com/mongodb/node-mongodb-native/issues/2807)) ([5d8f649](https://github.com/mongodb/node-mongodb-native/commit/5d8f6493a0ba4b525434c0868e2ae12315b4c249))
+* **sdam:** topology no longer causes close event ([#2791](https://github.com/mongodb/node-mongodb-native/issues/2791)) ([16e7064](https://github.com/mongodb/node-mongodb-native/commit/16e70642f25954a03b91a2c2991cea96b8356de7))
+* invalid case on writeconcern makes skip check fail ([#2773](https://github.com/mongodb/node-mongodb-native/issues/2773)) ([b1363c2](https://github.com/mongodb/node-mongodb-native/commit/b1363c26db5da5003f9db43be7e8d6e9007d45bd))
+
+### [3.6.6](https://github.com/mongodb/node-mongodb-native/compare/v3.6.5...v3.6.6) (2021-04-06)
+
+
+### Bug Fixes
+
+* always close gridfs upload stream on finish ([#2758](https://github.com/mongodb/node-mongodb-native/issues/2758)) ([c976a01](https://github.com/mongodb/node-mongodb-native/commit/c976a01bf385941bee07fa7f021adf1d425109a8))
+* **csfle:** ensure that monitoring connections are not encrypted ([#2749](https://github.com/mongodb/node-mongodb-native/issues/2749)) ([86bddf1](https://github.com/mongodb/node-mongodb-native/commit/86bddf1ef516d6b8c752082e33c15624753579ab))
+* ensure cursor readPreference is applied to find operations ([#2751](https://github.com/mongodb/node-mongodb-native/issues/2751)) ([91ba19e](https://github.com/mongodb/node-mongodb-native/commit/91ba19efdc4713903584c6161cfdd7b91b0e61f9))
+* ensure monitor has rtt pinger in when calculating rtt ([#2757](https://github.com/mongodb/node-mongodb-native/issues/2757)) ([b94519b](https://github.com/mongodb/node-mongodb-native/commit/b94519ba894b4442d3dabbac59bd12784d8b7178))
+* no infinite loop on windows requiring optional deps ([f2a4ff8](https://github.com/mongodb/node-mongodb-native/commit/f2a4ff870178fbbe8de616c45891368665f29f4b))
+* **NODE-2995:** Add shared metadata MongoClient ([#2760](https://github.com/mongodb/node-mongodb-native/issues/2760)) ([9256242](https://github.com/mongodb/node-mongodb-native/commit/9256242d51c037059c0af5ada9639fc0a74ad033))
+* **NODE-3109:** prevent servername from being IP ([#2763](https://github.com/mongodb/node-mongodb-native/issues/2763)) ([312ffef](https://github.com/mongodb/node-mongodb-native/commit/312ffef18c66a0020f19bdc1d654987d9148d709))
+
 ### [3.6.5](https://github.com/mongodb/node-mongodb-native/compare/v3.6.4...v3.6.5) (2021-03-16)
 
 

package/lib/bulk/common.js

@@ -5,6 +5,7 @@ const MongoError = require('../core').MongoError;
 const ObjectID = require('../core').BSON.ObjectID;
 const BSON = require('../core').BSON;
 const MongoWriteConcernError = require('../core').MongoWriteConcernError;
+const emitWarningOnce = require('../utils').emitWarningOnce;
 const toError = require('../utils').toError;
 const handleCallback = require('../utils').handleCallback;
 const applyRetryableWrites = require('../utils').applyRetryableWrites;
@@ -56,6 +57,9 @@ class Batch {
   }
 }
 
+const kUpsertedIds = Symbol('upsertedIds');
+const kInsertedIds = Symbol('insertedIds');
+
 /**
  * @classdesc
  * The result of a bulk write.
@@ -68,6 +72,60 @@ class BulkWriteResult {
    */
   constructor(bulkResult) {
     this.result = bulkResult;
+    this[kUpsertedIds] = undefined;
+    this[kInsertedIds] = undefined;
+  }
+
+  /** Number of documents inserted. */
+  get insertedCount() {
+    return typeof this.result.nInserted !== 'number' ? 0 : this.result.nInserted;
+  }
+  /** Number of documents matched for update. */
+  get matchedCount() {
+    return typeof this.result.nMatched !== 'number' ? 0 : this.result.nMatched;
+  }
+  /** Number of documents modified. */
+  get modifiedCount() {
+    return typeof this.result.nModified !== 'number' ? 0 : this.result.nModified;
+  }
+  /** Number of documents deleted. */
+  get deletedCount() {
+    return typeof this.result.nRemoved !== 'number' ? 0 : this.result.nRemoved;
+  }
+  /** Number of documents upserted. */
+  get upsertedCount() {
+    return !this.result.upserted ? 0 : this.result.upserted.length;
+  }
+
+  /** Upserted document generated Id's, hash key is the index of the originating operation */
+  get upsertedIds() {
+    if (this[kUpsertedIds]) {
+      return this[kUpsertedIds];
+    }
+
+    this[kUpsertedIds] = {};
+    for (const doc of this.result.upserted || []) {
+      this[kUpsertedIds][doc.index] = doc._id;
+    }
+    return this[kUpsertedIds];
+  }
+
+  /** Inserted document generated Id's, hash key is the index of the originating operation */
+  get insertedIds() {
+    if (this[kInsertedIds]) {
+      return this[kInsertedIds];
+    }
+
+    this[kInsertedIds] = {};
+    for (const doc of this.result.insertedIds || []) {
+      this[kInsertedIds][doc.index] = doc._id;
+    }
+    return this[kInsertedIds];
+  }
+
+  /** The number of inserted documents @type {number} */
+  get n() {
+    return this.result.insertedCount;
   }
 
   /**
@@ -571,6 +629,35 @@ class BulkWriteError extends MongoError {
     this.name = 'BulkWriteError';
     this.result = result;
   }
+
+  /** Number of documents inserted. */
+  get insertedCount() {
+    return this.result.insertedCount;
+  }
+  /** Number of documents matched for update. */
+  get matchedCount() {
+    return this.result.matchedCount;
+  }
+  /** Number of documents modified. */
+  get modifiedCount() {
+    return this.result.modifiedCount;
+  }
+  /** Number of documents deleted. */
+  get deletedCount() {
+    return this.result.deletedCount;
+  }
+  /** Number of documents upserted. */
+  get upsertedCount() {
+    return this.result.upsertedCount;
+  }
+  /** Inserted document generated Id's, hash key is the index of the originating operation */
+  get insertedIds() {
+    return this.result.insertedIds;
+  }
+  /** Upserted document generated Id's, hash key is the index of the originating operation */
+  get upsertedIds() {
+    return this.result.upsertedIds;
+  }
 }
 
 /**
@@ -737,15 +824,19 @@ class FindOperators {
 
   /**
    * backwards compatability for deleteOne
+   * @deprecated
    */
   removeOne() {
+    emitWarningOnce('bulk operation `removeOne` has been deprecated, please use `deleteOne`');
     return this.deleteOne();
   }
 
   /**
    * backwards compatability for delete
+   * @deprecated
    */
   remove() {
+    emitWarningOnce('bulk operation `remove` has been deprecated, please use `delete`');
     return this.delete();
   }
 }
@@ -1041,6 +1132,9 @@ class BulkOperationBase {
     }
 
     if (op.insertMany) {
+      emitWarningOnce(
+        'bulk operation `insertMany` has been deprecated; use multiple `insertOne` ops instead'
+      );
       for (let i = 0; i < op.insertMany.length; i++) {
         if (forceServerObjectId !== true && op.insertMany[i]._id == null)
           op.insertMany[i]._id = new ObjectID();
@@ -1294,5 +1388,6 @@ module.exports = {
   INSERT: INSERT,
   UPDATE: UPDATE,
   REMOVE: REMOVE,
-  BulkWriteError
+  BulkWriteError,
+  BulkWriteResult
 };

package/lib/cmap/connection.js

@@ -58,38 +58,9 @@ class Connection extends EventEmitter {
       /* ignore errors, listen to `close` instead */
     });
 
-    stream.on('close', () => {
-      if (this.closed) {
-        return;
-      }
-
-      this.closed = true;
-      this[kQueue].forEach(op =>
-        op.cb(new MongoNetworkError(`connection ${this.id} to ${this.address} closed`))
-      );
-      this[kQueue].clear();
-
-      this.emit('close');
-    });
-
-    stream.on('timeout', () => {
-      if (this.closed) {
-        return;
-      }
-
-      stream.destroy();
-      this.closed = true;
-      this[kQueue].forEach(op =>
-        op.cb(
-          new MongoNetworkTimeoutError(`connection ${this.id} to ${this.address} timed out`, {
-            beforeHandshake: this[kIsMaster] == null
-          })
-        )
-      );
-
-      this[kQueue].clear();
-      this.emit('close');
-    });
+    this[kMessageStream].on('error', error => this.handleIssue({ destroy: error }));
+    stream.on('close', () => this.handleIssue({ isClose: true }));
+    stream.on('timeout', () => this.handleIssue({ isTimeout: true, destroy: true }));
 
     // hook the message stream up to the passed in stream
     stream.pipe(this[kMessageStream]);
@@ -132,6 +103,39 @@ class Connection extends EventEmitter {
     this[kLastUseTime] = now();
   }
 
+  /**
+   * @param {{ isTimeout?: boolean; isClose?: boolean; destroy?: boolean | Error }} issue
+   */
+  handleIssue(issue) {
+    if (this.closed) {
+      return;
+    }
+
+    if (issue.destroy) {
+      this[kStream].destroy(typeof issue.destroy === 'boolean' ? undefined : issue.destroy);
+    }
+
+    this.closed = true;
+
+    for (const idAndOp of this[kQueue]) {
+      const op = idAndOp[1];
+      if (issue.isTimeout) {
+        op.cb(
+          new MongoNetworkTimeoutError(`connection ${this.id} to ${this.address} timed out`, {
+            beforeHandshake: this.ismaster == null
+          })
+        );
+      } else if (issue.isClose) {
+        op.cb(new MongoNetworkError(`connection ${this.id} to ${this.address} closed`));
+      } else {
+        op.cb(typeof issue.destroy === 'boolean' ? undefined : issue.destroy);
+      }
+    }
+
+    this[kQueue].clear();
+    this.emit('close');
+  }
+
   destroy(options, callback) {
     if (typeof options === 'function') {
       callback = options;

package/lib/collection.js

@@ -1655,7 +1655,7 @@ Collection.prototype.stats = function(options, callback) {
 
 /**
  * @typedef {Object} Collection~findAndModifyWriteOpResult
- * @property {object} value Document returned from the `findAndModify` command. If no documents were found, `value` will be `null` by default (`returnOriginal: true`), even if a document was upserted; if `returnOriginal` was false, the upserted document will be returned in that case.
+ * @property {object} value Document returned from the `findAndModify` command. If no documents were found, `value` will be `null` by default even if a document was upserted unless `returnDocument` is specified as `'after'`, in which case the upserted document will be returned.
  * @property {object} lastErrorObject The raw lastErrorObject returned from the command. See {@link https://docs.mongodb.com/manual/reference/command/findAndModify/index.html#lasterrorobject|findAndModify command documentation}.
  * @property {Number} ok Is 1 if the command executed correctly.
  */
@@ -1716,7 +1716,8 @@ Collection.prototype.findOneAndDelete = function(filter, options, callback) {
  * @param {object} [options.projection] Limits the fields to return for all matching documents.
  * @param {object} [options.sort] Determines which document the operation modifies if the query selects multiple documents.
  * @param {boolean} [options.upsert=false] Upsert the document if it does not exist.
- * @param {boolean} [options.returnOriginal=true] When false, returns the updated document rather than the original. The default is true.
+ * @param {'before'|'after'} [options.returnDocument='before'] When set to `'after'`, returns the updated document rather than the original. The default is `'before'`.
+ * @param {boolean} [options.returnOriginal=true] **Deprecated** Use `options.returnDocument` instead.
  * @param {boolean} [options.checkKeys=false] If true, will throw if bson documents start with `$` or include a `.` in any key value
  * @param {boolean} [options.serializeFunctions=false] Serialize functions on any object.
  * @param {boolean} [options.ignoreUndefined=false] Specify if the BSON serializer should ignore undefined fields.
@@ -1725,22 +1726,29 @@ Collection.prototype.findOneAndDelete = function(filter, options, callback) {
  * @param {Collection~findAndModifyCallback} [callback] The collection result callback
  * @return {Promise<Collection~findAndModifyWriteOpResultObject>} returns Promise if no callback passed
  */
-Collection.prototype.findOneAndReplace = function(filter, replacement, options, callback) {
-  if (typeof options === 'function') (callback = options), (options = {});
-  options = options || {};
+Collection.prototype.findOneAndReplace = deprecateOptions(
+  {
+    name: 'collection.findOneAndReplace',
+    deprecatedOptions: ['returnOriginal'],
+    optionsIndex: 2
+  },
+  function(filter, replacement, options, callback) {
+    if (typeof options === 'function') (callback = options), (options = {});
+    options = options || {};
 
-  // Add ignoreUndefined
-  if (this.s.options.ignoreUndefined) {
-    options = Object.assign({}, options);
-    options.ignoreUndefined = this.s.options.ignoreUndefined;
-  }
+    // Add ignoreUndefined
+    if (this.s.options.ignoreUndefined) {
+      options = Object.assign({}, options);
+      options.ignoreUndefined = this.s.options.ignoreUndefined;
+    }
 
-  return executeOperation(
-    this.s.topology,
-    new FindOneAndReplaceOperation(this, filter, replacement, options),
-    callback
-  );
-};
+    return executeOperation(
+      this.s.topology,
+      new FindOneAndReplaceOperation(this, filter, replacement, options),
+      callback
+    );
+  }
+);
 
 /**
  * Find a document and update it in one atomic operation. Requires a write lock for the duration of the operation.
@@ -1757,7 +1765,8 @@ Collection.prototype.findOneAndReplace = function(filter, replacement, options,
  * @param {object} [options.projection] Limits the fields to return for all matching documents.
  * @param {object} [options.sort] Determines which document the operation modifies if the query selects multiple documents.
  * @param {boolean} [options.upsert=false] Upsert the document if it does not exist.
- * @param {boolean} [options.returnOriginal=true] When false, returns the updated document rather than the original. The default is true.
+ * @param {'before'|'after'} [options.returnDocument='before'] When set to `'after'`, returns the updated document rather than the original. The default is `'before'`.
+ * @param {boolean} [options.returnOriginal=true] **Deprecated** Use `options.returnDocument` instead.
  * @param {boolean} [options.checkKeys=false] If true, will throw if bson documents start with `$` or include a `.` in any key value
  * @param {boolean} [options.serializeFunctions=false] Serialize functions on any object.
  * @param {boolean} [options.ignoreUndefined=false] Specify if the BSON serializer should ignore undefined fields.
@@ -1766,22 +1775,29 @@ Collection.prototype.findOneAndReplace = function(filter, replacement, options,
  * @param {Collection~findAndModifyCallback} [callback] The collection result callback
  * @return {Promise<Collection~findAndModifyWriteOpResultObject>} returns Promise if no callback passed
  */
-Collection.prototype.findOneAndUpdate = function(filter, update, options, callback) {
-  if (typeof options === 'function') (callback = options), (options = {});
-  options = options || {};
+Collection.prototype.findOneAndUpdate = deprecateOptions(
+  {
+    name: 'collection.findOneAndUpdate',
+    deprecatedOptions: ['returnOriginal'],
+    optionsIndex: 2
+  },
+  function(filter, update, options, callback) {
+    if (typeof options === 'function') (callback = options), (options = {});
+    options = options || {};
 
-  // Add ignoreUndefined
-  if (this.s.options.ignoreUndefined) {
-    options = Object.assign({}, options);
-    options.ignoreUndefined = this.s.options.ignoreUndefined;
-  }
+    // Add ignoreUndefined
+    if (this.s.options.ignoreUndefined) {
+      options = Object.assign({}, options);
+      options.ignoreUndefined = this.s.options.ignoreUndefined;
+    }
 
-  return executeOperation(
-    this.s.topology,
-    new FindOneAndUpdateOperation(this, filter, update, options),
-    callback
-  );
-};
+    return executeOperation(
+      this.s.topology,
+      new FindOneAndUpdateOperation(this, filter, update, options),
+      callback
+    );
+  }
+);
 
 /**
  * Find and update a document.
@@ -2199,7 +2215,6 @@ Collection.prototype.initializeUnorderedBulkOp = function(options) {
  * @param {object|WriteConcern} [options.writeConcern] Specify write concern settings.
  * @param {ClientSession} [options.session] optional session to use for this operation
  * @param {boolean} [options.ignoreUndefined=false] Specify if the BSON serializer should ignore undefined fields.
- * @param {OrderedBulkOperation} callback The command result callback
  * @return {null}
  */
 Collection.prototype.initializeOrderedBulkOp = function(options) {

package/lib/core/auth/mongo_credentials.js

@@ -49,16 +49,16 @@ class MongoCredentials {
     this.mechanism = options.mechanism || 'default';
     this.mechanismProperties = options.mechanismProperties || {};
 
-    if (this.mechanism.match(/MONGODB-AWS/i)) {
-      if (this.username == null && process.env.AWS_ACCESS_KEY_ID) {
+    if (/MONGODB-AWS/i.test(this.mechanism)) {
+      if (!this.username && process.env.AWS_ACCESS_KEY_ID) {
         this.username = process.env.AWS_ACCESS_KEY_ID;
       }
 
-      if (this.password == null && process.env.AWS_SECRET_ACCESS_KEY) {
+      if (!this.password && process.env.AWS_SECRET_ACCESS_KEY) {
         this.password = process.env.AWS_SECRET_ACCESS_KEY;
       }
 
-      if (this.mechanismProperties.AWS_SESSION_TOKEN == null && process.env.AWS_SESSION_TOKEN) {
+      if (!this.mechanismProperties.AWS_SESSION_TOKEN && process.env.AWS_SESSION_TOKEN) {
         this.mechanismProperties.AWS_SESSION_TOKEN = process.env.AWS_SESSION_TOKEN;
       }
     }
@@ -90,7 +90,7 @@ class MongoCredentials {
    */
   resolveAuthMechanism(ismaster) {
     // If the mechanism is not "default", then it does not need to be resolved
-    if (this.mechanism.match(/DEFAULT/i)) {
+    if (/DEFAULT/i.test(this.mechanism)) {
       return new MongoCredentials({
         username: this.username,
         password: this.password,

package/lib/core/connection/connect.js

@@ -243,7 +243,7 @@ function parseSslOptions(family, options) {
   }
 
   // Set default sni servername to be the same as host
-  if (result.servername == null) {
+  if (result.servername == null && !net.isIP(result.host)) {
     result.servername = result.host;
   }
 

package/lib/core/connection/utils.js

@@ -1,9 +1,9 @@
 'use strict';
 
-const require_optional = require('require_optional');
+const require_optional = require('optional-require')(require);
 
 function debugOptions(debugFields, options) {
-  var finaloptions = {};
+  const finaloptions = {};
   debugFields.forEach(function(n) {
     finaloptions[n] = options[n];
   });
@@ -12,16 +12,14 @@ function debugOptions(debugFields, options) {
 }
 
 function retrieveBSON() {
-  var BSON = require('bson');
+  const BSON = require('bson');
   BSON.native = false;
 
-  try {
-    var optionalBSON = require_optional('bson-ext');
-    if (optionalBSON) {
-      optionalBSON.native = true;
-      return optionalBSON;
-    }
-  } catch (err) {} // eslint-disable-line
+  const optionalBSON = require_optional('bson-ext');
+  if (optionalBSON) {
+    optionalBSON.native = true;
+    return optionalBSON;
+  }
 
   return BSON;
 }
@@ -35,10 +33,7 @@ function noSnappyWarning() {
 
 // Facilitate loading Snappy optionally
 function retrieveSnappy() {
-  var snappy = null;
-  try {
-    snappy = require_optional('snappy');
-  } catch (error) {} // eslint-disable-line
+  let snappy = require_optional('snappy');
   if (!snappy) {
     snappy = {
       compress: noSnappyWarning,

package/lib/core/error.js

@@ -102,8 +102,8 @@ class MongoNetworkError extends MongoError {
     super(message);
     this.name = 'MongoNetworkError';
 
-    if (options && options.beforeHandshake === true) {
-      this[kBeforeHandshake] = true;
+    if (options && typeof options.beforeHandshake === 'boolean') {
+      this[kBeforeHandshake] = options.beforeHandshake;
     }
   }
 }

package/lib/core/index.js

@@ -1,7 +1,7 @@
 'use strict';
 
 let BSON = require('bson');
-const require_optional = require('require_optional');
+const require_optional = require('optional-require')(require);
 const EJSON = require('./utils').retrieveEJSON();
 
 try {

package/lib/core/sdam/monitor.js

@@ -91,6 +91,10 @@ class Monitor extends EventEmitter {
 
     // ensure no authentication is used for monitoring
     delete connectOptions.credentials;
+
+    // ensure encryption is not requested for monitoring
+    delete connectOptions.autoEncrypter;
+
     this.connectOptions = Object.freeze(connectOptions);
   }
 
@@ -222,9 +226,10 @@ function checkServer(monitor, callback) {
       }
 
       const isMaster = result.result;
-      const duration = isAwaitable
-        ? monitor[kRTTPinger].roundTripTime
-        : calculateDurationInMs(start);
+      const rttPinger = monitor[kRTTPinger];
+
+      const duration =
+        isAwaitable && rttPinger ? rttPinger.roundTripTime : calculateDurationInMs(start);
 
       monitor.emit(
         'serverHeartbeatSucceeded',

package/lib/core/sdam/topology.js

@@ -359,7 +359,6 @@ class Topology extends EventEmitter {
           this.emit('topologyClosed', new events.TopologyClosedEvent(this.s.id));
 
           stateTransition(this, STATE_CLOSED);
-          this.emit('close');
 
           if (typeof callback === 'function') {
             callback(err);

package/lib/core/topologies/replset.js

@@ -558,7 +558,7 @@ var monitorServer = function(host, self, options) {
               self.s.options.secondaryOnlyConnectionAllowed) ||
               self.s.replicaSetState.hasPrimary())
           ) {
-            stateTransition(self, CONNECTED);
+            stateTransition(self, CONNECTING);
 
             // Rexecute any stalled operation
             rexecuteOperations(self);

package/lib/core/uri_parser.js

@@ -52,7 +52,9 @@ function parseSrvConnectionString(uri, options, callback) {
   }
 
   result.domainLength = result.hostname.split('.').length;
-  if (result.pathname && result.pathname.match(',')) {
+
+  const hostname = uri.substring('mongodb+srv://'.length).split('/')[0];
+  if (hostname.match(',')) {
     return callback(new MongoParseError('Invalid URI, cannot contain multiple hostnames'));
   }
 

package/lib/core/utils.js

@@ -1,7 +1,7 @@
 'use strict';
 const os = require('os');
 const crypto = require('crypto');
-const requireOptional = require('require_optional');
+const requireOptional = require('optional-require')(require);
 
 /**
  * Generate a UUIDv4
@@ -46,10 +46,7 @@ const noEJSONError = function() {
 
 // Facilitate loading EJSON optionally
 function retrieveEJSON() {
-  let EJSON = null;
-  try {
-    EJSON = requireOptional('mongodb-extjson');
-  } catch (error) {} // eslint-disable-line
+  let EJSON = requireOptional('mongodb-extjson');
   if (!EJSON) {
     EJSON = {
       parse: noEJSONError,

package/lib/core/wireprotocol/command.js

@@ -45,14 +45,19 @@ function _command(server, ns, cmd, options, callback) {
   const shouldUseOpMsg = supportsOpMsg(server);
   const session = options.session;
 
-  let clusterTime = server.clusterTime;
+  const serverClusterTime = server.clusterTime;
+  let clusterTime = serverClusterTime;
   let finalCmd = Object.assign({}, cmd);
   if (hasSessionSupport(server) && session) {
+    const sessionClusterTime = session.clusterTime;
     if (
-      session.clusterTime &&
-      session.clusterTime.clusterTime.greaterThan(clusterTime.clusterTime)
+      serverClusterTime &&
+      serverClusterTime.clusterTime &&
+      sessionClusterTime &&
+      sessionClusterTime.clusterTime &&
+      sessionClusterTime.clusterTime.greaterThan(serverClusterTime.clusterTime)
     ) {
-      clusterTime = session.clusterTime;
+      clusterTime = sessionClusterTime;
     }
 
     const err = applySession(session, finalCmd, options);
@@ -61,8 +66,8 @@ function _command(server, ns, cmd, options, callback) {
     }
   }
 
-  // if we have a known cluster time, gossip it
   if (clusterTime) {
+    // if we have a known cluster time, gossip it
     finalCmd.$clusterTime = clusterTime;
   }