mongodb 3.5.5 → 3.5.9

package/lib/core/sessions.js

@@ -17,7 +17,8 @@ const isTransactionCommand = require('./transactions').isTransactionCommand;
 const resolveClusterTime = require('./topologies/shared').resolveClusterTime;
 const isSharded = require('./wireprotocol/shared').isSharded;
 const maxWireVersion = require('./utils').maxWireVersion;
-
+const now = require('./../utils').now;
+const calculateDurationInMs = require('./../utils').calculateDurationInMs;
 const minWireVersionForShardedTransactions = 8;
 
 function assertAlive(session, callback) {
@@ -46,6 +47,8 @@ function assertAlive(session, callback) {
  * @typedef {Object} SessionId
  */
 
+const kServerSession = Symbol('serverSession');
+
 /**
  * A class representing a client session on the server
  * WARNING: not meant to be instantiated directly.
@@ -79,8 +82,8 @@ class ClientSession extends EventEmitter {
     this.topology = topology;
     this.sessionPool = sessionPool;
     this.hasEnded = false;
-    this.serverSession = sessionPool.acquire();
     this.clientOptions = clientOptions;
+    this[kServerSession] = undefined;
 
     this.supports = {
       causalConsistency:
@@ -104,6 +107,14 @@ class ClientSession extends EventEmitter {
     return this.serverSession.id;
   }
 
+  get serverSession() {
+    if (this[kServerSession] == null) {
+      this[kServerSession] = this.sessionPool.acquire();
+    }
+
+    return this[kServerSession];
+  }
+
   /**
    * Ends this session on the server
    *
@@ -123,14 +134,14 @@ class ClientSession extends EventEmitter {
       this.abortTransaction(); // pass in callback?
     }
 
+    // release the server session back to the pool
+    this.sessionPool.release(this.serverSession);
+    this[kServerSession] = undefined;
+
     // mark the session as ended, and emit a signal
     this.hasEnded = true;
     this.emit('ended', this);
 
-    // release the server session back to the pool
-    this.sessionPool.release(this.serverSession);
-    this.serverSession = null;
-
     // spec indicates that we should ignore all errors for `endSessions`
     if (typeof callback === 'function') callback(null, null);
   }
@@ -275,7 +286,7 @@ class ClientSession extends EventEmitter {
    * @param {TransactionOptions} [options] Optional settings for the transaction
    */
   withTransaction(fn, options) {
-    const startTime = Date.now();
+    const startTime = now();
     return attemptTransaction(this, startTime, fn, options);
   }
 }
@@ -291,7 +302,7 @@ const NON_DETERMINISTIC_WRITE_CONCERN_ERRORS = new Set([
 ]);
 
 function hasNotTimedOut(startTime, max) {
-  return Date.now() - startTime < max;
+  return calculateDurationInMs(startTime) < max;
 }
 
 function isUnknownTransactionCommitResult(err) {
@@ -304,6 +315,7 @@ function isUnknownTransactionCommitResult(err) {
 }
 
 function isMaxTimeMSExpiredError(err) {
+  if (err == null) return false;
   return (
     err.code === MAX_TIME_MS_EXPIRED_CODE ||
     (err.writeConcernError && err.writeConcernError.code === MAX_TIME_MS_EXPIRED_CODE)
@@ -547,7 +559,7 @@ function supportsRecoveryToken(session) {
 class ServerSession {
   constructor() {
     this.id = { id: new Binary(uuidV4(), Binary.SUBTYPE_UUID) };
-    this.lastUse = Date.now();
+    this.lastUse = now();
     this.txnNumber = 0;
     this.isDirty = false;
   }
@@ -562,7 +574,7 @@ class ServerSession {
     // Take the difference of the lastUse timestamp and now, which will result in a value in
     // milliseconds, and then convert milliseconds to minutes to compare to `sessionTimeoutMinutes`
     const idleTimeMinutes = Math.round(
-      (((Date.now() - this.lastUse) % 86400000) % 3600000) / 60000
+      ((calculateDurationInMs(this.lastUse) % 86400000) % 3600000) / 60000
     );
 
     return idleTimeMinutes > sessionTimeoutMinutes - 1;
@@ -691,14 +703,13 @@ function commandSupportsReadConcern(command, options) {
  * @return {MongoError|null} An error, if some error condition was met
  */
 function applySession(session, command, options) {
-  const serverSession = session.serverSession;
-  if (serverSession == null) {
+  if (session.hasEnded) {
     // TODO: merge this with `assertAlive`, did not want to throw a try/catch here
     return new MongoError('Cannot use a session that has ended');
   }
 
-  // mark the last use of this session, and apply the `lsid`
-  serverSession.lastUse = Date.now();
+  const serverSession = session.serverSession;
+  serverSession.lastUse = now();
   command.lsid = serverSession.id;
 
   // first apply non-transaction-specific sessions data

package/lib/core/topologies/replset.js

@@ -17,9 +17,10 @@ const isRetryableWritesSupported = require('./shared').isRetryableWritesSupporte
 const relayEvents = require('../utils').relayEvents;
 const isRetryableError = require('../error').isRetryableError;
 const BSON = retrieveBSON();
-const calculateDurationInMs = require('../utils').calculateDurationInMs;
 const getMMAPError = require('./shared').getMMAPError;
 const makeClientMetadata = require('../utils').makeClientMetadata;
+const now = require('../../utils').now;
+const calculateDurationInMs = require('../../utils').calculateDurationInMs;
 
 //
 // States
@@ -426,8 +427,7 @@ var pingServer = function(self, server, cb) {
       var latencyMS = new Date().getTime() - start;
 
       // Set the last updatedTime
-      var hrtime = process.hrtime();
-      server.lastUpdateTime = (hrtime[0] * 1e9 + hrtime[1]) / 1e6;
+      server.lastUpdateTime = now();
 
       // We had an error, remove it from the state
       if (err) {
@@ -1127,7 +1127,7 @@ ReplSet.prototype.selectServer = function(selector, options, callback) {
   }
 
   let lastError;
-  const start = process.hrtime();
+  const start = now();
   const _selectServer = () => {
     if (calculateDurationInMs(start) >= SERVER_SELECTION_TIMEOUT_MS) {
       if (lastError != null) {

package/lib/core/uri_parser.js

@@ -285,8 +285,8 @@ function applyConnectionStringOption(obj, key, value, options) {
     }
   }
 
-  if (key === 'readpreferencetags' && Array.isArray(value)) {
-    value = splitArrayOfMultipleReadPreferenceTags(value);
+  if (key === 'readpreferencetags') {
+    value = Array.isArray(value) ? splitArrayOfMultipleReadPreferenceTags(value) : [value];
   }
 
   // set the actual value

package/lib/core/utils.js

@@ -13,17 +13,6 @@ const uuidV4 = () => {
   return result;
 };
 
-/**
- * Returns the duration calculated from two high resolution timers in milliseconds
- *
- * @param {Object} started A high resolution timestamp created from `process.hrtime()`
- * @returns {Number} The duration in milliseconds
- */
-const calculateDurationInMs = started => {
-  const hrtime = process.hrtime(started);
-  return (hrtime[0] * 1e9 + hrtime[1]) / 1e6;
-};
-
 /**
  * Relays events for a given listener and emitter
  *
@@ -83,22 +72,24 @@ function retrieveEJSON() {
  * @param {(Topology|Server)} topologyOrServer
  */
 function maxWireVersion(topologyOrServer) {
-  if (topologyOrServer.ismaster) {
-    return topologyOrServer.ismaster.maxWireVersion;
-  }
+  if (topologyOrServer) {
+    if (topologyOrServer.ismaster) {
+      return topologyOrServer.ismaster.maxWireVersion;
+    }
 
-  if (typeof topologyOrServer.lastIsMaster === 'function') {
-    const lastIsMaster = topologyOrServer.lastIsMaster();
-    if (lastIsMaster) {
-      return lastIsMaster.maxWireVersion;
+    if (typeof topologyOrServer.lastIsMaster === 'function') {
+      const lastIsMaster = topologyOrServer.lastIsMaster();
+      if (lastIsMaster) {
+        return lastIsMaster.maxWireVersion;
+      }
     }
-  }
 
-  if (topologyOrServer.description) {
-    return topologyOrServer.description.maxWireVersion;
+    if (topologyOrServer.description) {
+      return topologyOrServer.description.maxWireVersion;
+    }
   }
 
-  return null;
+  return 0;
 }
 
 /*
@@ -259,7 +250,6 @@ const noop = () => {};
 
 module.exports = {
   uuidV4,
-  calculateDurationInMs,
   relayEvents,
   collationNotSupported,
   retrieveEJSON,

package/lib/core/wireprotocol/get_more.js

@@ -62,8 +62,13 @@ function getMore(server, ns, cursorState, batchSize, options, callback) {
     return;
   }
 
+  const cursorId =
+    cursorState.cursorId instanceof Long
+      ? cursorState.cursorId
+      : Long.fromNumber(cursorState.cursorId);
+
   const getMoreCmd = {
-    getMore: cursorState.cursorId,
+    getMore: cursorId,
     collection: collectionNamespace(ns),
     batchSize: Math.abs(batchSize)
   };

package/lib/cursor.js

@@ -819,6 +819,7 @@ class Cursor extends CoreCursor {
         driver: true
       });
     }
+
     return maybePromise(this, callback, cb => {
       const cursor = this;
       const items = [];
@@ -831,9 +832,7 @@ class Cursor extends CoreCursor {
       const fetchDocs = () => {
         cursor._next((err, doc) => {
           if (err) {
-            return cursor._endSession
-              ? cursor._endSession(() => handleCallback(cb, err))
-              : handleCallback(cb, err);
+            return handleCallback(cb, err);
           }
 
           if (doc == null) {
@@ -846,12 +845,6 @@ class Cursor extends CoreCursor {
           // Get all buffered objects
           if (cursor.bufferedCount() > 0) {
             let docs = cursor.readBufferedDocuments(cursor.bufferedCount());
-
-            // Transform the doc if transform method added
-            if (cursor.s.transforms && typeof cursor.s.transforms.doc === 'function') {
-              docs = docs.map(cursor.s.transforms.doc);
-            }
-
             Array.prototype.push.apply(items, docs);
           }
 
@@ -919,38 +912,18 @@ class Cursor extends CoreCursor {
     if (typeof options === 'function') (callback = options), (options = {});
     options = Object.assign({}, { skipKillCursors: false }, options);
 
-    this.s.state = CursorState.CLOSED;
-    if (!options.skipKillCursors) {
-      // Kill the cursor
-      this.kill();
-    }
-
-    const completeClose = () => {
-      // Emit the close event for the cursor
-      this.emit('close');
-
-      // Callback if provided
-      if (typeof callback === 'function') {
-        return handleCallback(callback, null, this);
-      }
-
-      // Return a Promise
-      return new this.s.promiseLibrary(resolve => {
-        resolve();
-      });
-    };
-
-    if (this.cursorState.session) {
-      if (typeof callback === 'function') {
-        return this._endSession(() => completeClose());
+    return maybePromise(this, callback, cb => {
+      this.s.state = CursorState.CLOSED;
+      if (!options.skipKillCursors) {
+        // Kill the cursor
+        this.kill();
       }
 
-      return new this.s.promiseLibrary(resolve => {
-        this._endSession(() => completeClose().then(resolve));
+      this._endSession(() => {
+        this.emit('close');
+        cb(null, this);
       });
-    }
-
-    return completeClose();
+    });
   }
 
   /**

package/lib/error.js

@@ -1,45 +1,38 @@
 'use strict';
 
 const MongoNetworkError = require('./core').MongoNetworkError;
-const mongoErrorContextSymbol = require('./core').mongoErrorContextSymbol;
 
-const GET_MORE_NON_RESUMABLE_CODES = new Set([
-  136, // CappedPositionLost
-  237, // CursorKilled
-  11601 // Interrupted
+// From spec@https://github.com/mongodb/specifications/blob/f93d78191f3db2898a59013a7ed5650352ef6da8/source/change-streams/change-streams.rst#resumable-error
+const GET_MORE_RESUMABLE_CODES = new Set([
+  6, // HostUnreachable
+  7, // HostNotFound
+  89, // NetworkTimeout
+  91, // ShutdownInProgress
+  189, // PrimarySteppedDown
+  262, // ExceededTimeLimit
+  9001, // SocketException
+  10107, // NotMaster
+  11600, // InterruptedAtShutdown
+  11602, // InterruptedDueToReplStateChange
+  13435, // NotMasterNoSlaveOk
+  13436, // NotMasterOrSecondary
+  63, // StaleShardVersion
+  150, // StaleEpoch
+  13388, // StaleConfig
+  234, // RetryChangeStream
+  133 // FailedToSatisfyReadPreference
 ]);
 
-// From spec@https://github.com/mongodb/specifications/blob/7a2e93d85935ee4b1046a8d2ad3514c657dc74fa/source/change-streams/change-streams.rst#resumable-error:
-//
-// An error is considered resumable if it meets any of the following criteria:
-// - any error encountered which is not a server error (e.g. a timeout error or network error)
-// - any server error response from a getMore command excluding those containing the error label
-//   NonRetryableChangeStreamError and those containing the following error codes:
-//   - Interrupted: 11601
-//   - CappedPositionLost: 136
-//   - CursorKilled: 237
-//
-// An error on an aggregate command is not a resumable error. Only errors on a getMore command may be considered resumable errors.
-
-function isGetMoreError(error) {
-  if (error[mongoErrorContextSymbol]) {
-    return error[mongoErrorContextSymbol].isGetMore;
-  }
-}
-
-function isResumableError(error) {
-  if (!isGetMoreError(error)) {
-    return false;
-  }
-
+function isResumableError(error, wireVersion) {
   if (error instanceof MongoNetworkError) {
     return true;
   }
 
-  return !(
-    GET_MORE_NON_RESUMABLE_CODES.has(error.code) ||
-    error.hasErrorLabel('NonRetryableChangeStreamError')
-  );
+  if (wireVersion >= 9) {
+    return error.hasErrorLabel('ResumableChangeStreamError');
+  }
+
+  return GET_MORE_RESUMABLE_CODES.has(error.code);
 }
 
-module.exports = { GET_MORE_NON_RESUMABLE_CODES, isResumableError };
+module.exports = { GET_MORE_RESUMABLE_CODES, isResumableError };

package/lib/mongo_client.js

@@ -143,6 +143,13 @@ const validOptions = require('./operations/connect').validOptions;
  * @param {number} [options.minSize] If present, the connection pool will be initialized with minSize connections, and will never dip below minSize connections
  * @param {boolean} [options.useNewUrlParser=true] Determines whether or not to use the new url parser. Enables the new, spec-compliant, url parser shipped in the core driver. This url parser fixes a number of problems with the original parser, and aims to outright replace that parser in the near future. Defaults to true, and must be explicitly set to false to use the legacy url parser.
  * @param {boolean} [options.useUnifiedTopology] Enables the new unified topology layer
+ * @param {Number} [options.localThresholdMS=15] **Only applies to the unified topology** The size of the latency window for selecting among multiple suitable servers
+ * @param {Number} [options.serverSelectionTimeoutMS=30000] **Only applies to the unified topology** How long to block for server selection before throwing an error
+ * @param {Number} [options.heartbeatFrequencyMS=10000] **Only applies to the unified topology** The frequency with which topology updates are scheduled
+ * @param {number} [options.maxPoolSize=10] **Only applies to the unified topology** The maximum number of connections that may be associated with a pool at a given time. This includes in use and available connections.
+ * @param {number} [options.minPoolSize=0] **Only applies to the unified topology** The minimum number of connections that MUST exist at any moment in a single connection pool.
+ * @param {number} [options.maxIdleTimeMS] **Only applies to the unified topology** The maximum amount of time a connection should remain idle in the connection pool before being marked idle. The default is infinity.
+ * @param {number} [options.waitQueueTimeoutMS=0] **Only applies to the unified topology** The maximum amount of time operation execution should wait for a connection to become available. The default is 0 which means there is no limit.
  * @param {AutoEncrypter~AutoEncryptionOptions} [options.autoEncryption] Optionally enable client side auto encryption
  * @param {DriverInfoOptions} [options.driverInfo] Allows a wrapping driver to amend the client metadata generated by the driver to include information about the wrapping driver
  * @param {MongoClient~connectCallback} [callback] The command result callback
@@ -344,7 +351,7 @@ MongoClient.prototype.isConnected = function(options) {
  * @param {object} [options] Optional settings
  * @param {number} [options.poolSize=5] The maximum size of the individual server pool
  * @param {boolean} [options.ssl=false] Enable SSL connection. *deprecated* use `tls` variants
- * @param {boolean} [options.sslValidate=false] Validate mongod server certificate against Certificate Authority *deprecated* use `tls` variants
+ * @param {boolean} [options.sslValidate=false] Validate mongod server certificate against Certificate Authority
  * @param {buffer} [options.sslCA=undefined] SSL Certificate store binary buffer *deprecated* use `tls` variants
  * @param {buffer} [options.sslCert=undefined] SSL Certificate binary buffer *deprecated* use `tls` variants
  * @param {buffer} [options.sslKey=undefined] SSL Key file binary buffer *deprecated* use `tls` variants
@@ -361,7 +368,7 @@ MongoClient.prototype.isConnected = function(options) {
  * @param {boolean} [options.autoReconnect=true] Enable autoReconnect for single server instances
  * @param {boolean} [options.noDelay=true] TCP Connection no delay
  * @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.keepAliveInitialDelay=30000] The number of milliseconds to wait before initiating keepAlive on the TCP socket
  * @param {number} [options.connectTimeoutMS=10000] How long to wait for a connection to be established before timing out
  * @param {number} [options.socketTimeoutMS=360000] How long a send or receive on a socket can take before timing out
  * @param {number} [options.family] Version of IP stack. Can be 4, 6 or null (default).
@@ -405,7 +412,19 @@ MongoClient.prototype.isConnected = function(options) {
  * @param {array} [options.readPreferenceTags] 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 {boolean} [options.useNewUrlParser=true] Determines whether or not to use the new url parser. Enables the new, spec-compliant, url parser shipped in the core driver. This url parser fixes a number of problems with the original parser, and aims to outright replace that parser in the near future. Defaults to true, and must be explicitly set to false to use the legacy url parser.
+ * @param {boolean} [options.useUnifiedTopology] Enables the new unified topology layer
+ * @param {Number} [options.localThresholdMS=15] **Only applies to the unified topology** The size of the latency window for selecting among multiple suitable servers
+ * @param {Number} [options.serverSelectionTimeoutMS=30000] **Only applies to the unified topology** How long to block for server selection before throwing an error
+ * @param {Number} [options.heartbeatFrequencyMS=10000] **Only applies to the unified topology** The frequency with which topology updates are scheduled
+ * @param {number} [options.maxPoolSize=10] **Only applies to the unified topology** The maximum number of connections that may be associated with a pool at a given time. This includes in use and available connections.
+ * @param {number} [options.minPoolSize=0] **Only applies to the unified topology** The minimum number of connections that MUST exist at any moment in a single connection pool.
+ * @param {number} [options.maxIdleTimeMS] **Only applies to the unified topology** The maximum amount of time a connection should remain idle in the connection pool before being marked idle. The default is infinity.
+ * @param {number} [options.waitQueueTimeoutMS=0] **Only applies to the unified topology** The maximum amount of time operation execution should wait for a connection to become available. The default is 0 which means there is no limit.
+ * @param {AutoEncrypter~AutoEncryptionOptions} [options.autoEncryption] Optionally enable client side auto encryption
+ * @param {DriverInfoOptions} [options.driverInfo] Allows a wrapping driver to amend the client metadata generated by the driver to include information about the wrapping driver
  * @param {MongoClient~connectCallback} [callback] The command result callback
  * @return {Promise<MongoClient>} returns Promise if no callback passed
  */

package/lib/operations/connect.js

@@ -151,6 +151,11 @@ const validOptionNames = [
   'tlsCertificateKeyFilePassword',
   'minHeartbeatFrequencyMS',
   'heartbeatFrequencyMS',
+
+  // CMAP options
+  'maxPoolSize',
+  'minPoolSize',
+  'maxIdleTimeMS',
   'waitQueueTimeoutMS'
 ];
 
@@ -290,6 +295,12 @@ function connect(mongoClient, url, options, callback) {
       delete _finalOptions.db_options.auth;
     }
 
+    // `journal` should be translated to `j` for the driver
+    if (_finalOptions.journal != null) {
+      _finalOptions.j = _finalOptions.journal;
+      _finalOptions.journal = undefined;
+    }
+
     // resolve tls options if needed
     resolveTLSOptions(_finalOptions);
 

package/lib/operations/cursor_ops.js

@@ -134,10 +134,9 @@ function toArray(cursor, callback) {
   const fetchDocs = () => {
     cursor._next((err, doc) => {
       if (err) {
-        return cursor._endSession
-          ? cursor._endSession(() => handleCallback(callback, err))
-          : handleCallback(callback, err);
+        return handleCallback(callback, err);
       }
+
       if (doc == null) {
         return cursor.close({ skipKillCursors: true }, () => handleCallback(callback, null, items));
       }