mongodb 3.7.2 → 3.7.4

package/lib/bulk/common.js

@@ -414,6 +414,15 @@ class WriteError {
   }
 }
 
+/**
+ * Converts the number to a Long or returns it.
+ *
+ * @ignore
+ */
+function longOrConvert(value) {
+  return typeof value === 'number' ? Long.fromNumber(value) : value;
+}
+
 /**
  * Merges results into shared data structure
  * @ignore
@@ -445,42 +454,37 @@ function mergeBatchResults(batch, bulkResult, err, result) {
     return;
   }
 
-  // Deal with opTime if available
+  // The server write command specification states that lastOp is an optional
+  // mongod only field that has a type of timestamp. Across various scarce specs
+  // where opTime is mentioned, it is an "opaque" object that can have a "ts" and
+  // "t" field with Timestamp and Long as their types respectively.
+  // The "lastOp" field of the bulk write result is never mentioned in the driver
+  // specifications or the bulk write spec, so we should probably just keep its
+  // value consistent since it seems to vary.
+  // See: https://github.com/mongodb/specifications/blob/master/source/driver-bulk-update.rst#results-object
   if (result.opTime || result.lastOp) {
-    const opTime = result.lastOp || result.opTime;
-    let lastOpTS = null;
-    let lastOpT = null;
+    let opTime = result.lastOp || result.opTime;
 
-    // We have a time stamp
-    if (opTime && opTime._bsontype === 'Timestamp') {
-      if (bulkResult.lastOp == null) {
-        bulkResult.lastOp = opTime;
-      } else if (opTime.greaterThan(bulkResult.lastOp)) {
-        bulkResult.lastOp = opTime;
-      }
-    } else {
-      // Existing TS
-      if (bulkResult.lastOp) {
-        lastOpTS =
-          typeof bulkResult.lastOp.ts === 'number'
-            ? Long.fromNumber(bulkResult.lastOp.ts)
-            : bulkResult.lastOp.ts;
-        lastOpT =
-          typeof bulkResult.lastOp.t === 'number'
-            ? Long.fromNumber(bulkResult.lastOp.t)
-            : bulkResult.lastOp.t;
-      }
-
-      // Current OpTime TS
-      const opTimeTS = typeof opTime.ts === 'number' ? Long.fromNumber(opTime.ts) : opTime.ts;
-      const opTimeT = typeof opTime.t === 'number' ? Long.fromNumber(opTime.t) : opTime.t;
+    // If the opTime is a Timestamp, convert it to a consistent format to be
+    // able to compare easily. Converting to the object from a timestamp is
+    // much more straightforward than the other direction.
+    if (opTime._bsontype === 'Timestamp') {
+      opTime = { ts: opTime, t: Long.ZERO };
+    }
 
-      // Compare the opTime's
-      if (bulkResult.lastOp == null) {
-        bulkResult.lastOp = opTime;
-      } else if (opTimeTS.greaterThan(lastOpTS)) {
+    // If there's no lastOp, just set it.
+    if (!bulkResult.lastOp) {
+      bulkResult.lastOp = opTime;
+    } else {
+      // First compare the ts values and set if the opTimeTS value is greater.
+      const lastOpTS = longOrConvert(bulkResult.lastOp.ts);
+      const opTimeTS = longOrConvert(opTime.ts);
+      if (opTimeTS.greaterThan(lastOpTS)) {
         bulkResult.lastOp = opTime;
       } else if (opTimeTS.equals(lastOpTS)) {
+        // If the ts values are equal, then compare using the t values.
+        const lastOpT = longOrConvert(bulkResult.lastOp.t);
+        const opTimeT = longOrConvert(opTime.t);
         if (opTimeT.greaterThan(lastOpT)) {
           bulkResult.lastOp = opTime;
         }
@@ -1387,6 +1391,7 @@ Object.defineProperty(BulkOperationBase.prototype, 'length', {
 module.exports = {
   Batch,
   BulkOperationBase,
+  mergeBatchResults,
   bson,
   INSERT: INSERT,
   UPDATE: UPDATE,

package/lib/core/auth/scram.js

@@ -25,7 +25,7 @@ class ScramSHA extends AuthProvider {
 
   prepare(handshakeDoc, authContext, callback) {
     const cryptoMethod = this.cryptoMethod;
-    if (cryptoMethod === 'sha256' && saslprep == null) {
+    if (cryptoMethod === 'sha256' && typeof saslprep !== 'function') {
       emitWarningOnce('Warning: no saslprep library specified. Passwords will not be sanitized');
     }
 
@@ -125,7 +125,7 @@ function continueScramConversation(cryptoMethod, response, authContext, callback
 
   let processedPassword;
   if (cryptoMethod === 'sha256') {
-    processedPassword = saslprep ? saslprep(password) : password;
+    processedPassword = typeof saslprep === 'function' ? saslprep(password) : password;
   } else {
     try {
       processedPassword = passwordDigest(username, password);

package/lib/core/error.js

@@ -246,6 +246,10 @@ const RETRYABLE_WRITE_ERROR_CODES = new Set([
   MONGODB_ERROR_CODES.ExceededTimeLimit
 ]);
 
+function isRetryableEndTransactionError(error) {
+  return error.hasErrorLabel('RetryableWriteError');
+}
+
 function isRetryableWriteError(error) {
   if (error instanceof MongoWriteConcernError) {
     return (
@@ -347,5 +351,6 @@ module.exports = {
   isSDAMUnrecoverableError,
   isNodeShuttingDownError,
   isRetryableWriteError,
-  isNetworkErrorBeforeHandshake
+  isNetworkErrorBeforeHandshake,
+  isRetryableEndTransactionError
 };

package/lib/core/sessions.js

@@ -7,6 +7,7 @@ const Binary = BSON.Binary;
 const uuidV4 = require('./utils').uuidV4;
 const MongoError = require('./error').MongoError;
 const isRetryableError = require('././error').isRetryableError;
+const isRetryableEndTransactionError = require('././error').isRetryableEndTransactionError;
 const MongoNetworkError = require('./error').MongoNetworkError;
 const MongoWriteConcernError = require('./error').MongoWriteConcernError;
 const Transaction = require('./transactions').Transaction;
@@ -511,7 +512,7 @@ function endTransaction(session, commandName, callback) {
 
   // send the command
   session.topology.command('admin.$cmd', command, { session }, (err, reply) => {
-    if (err && isRetryableError(err)) {
+    if (err && isRetryableEndTransactionError(err)) {
       // SPEC-1185: apply majority write concern when retrying commitTransaction
       if (command.commitTransaction) {
         // per txns spec, must unpin session in this case

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mongodb",
-  "version": "3.7.2",
+  "version": "3.7.4",
   "description": "The official MongoDB driver for Node.js",
   "main": "index.js",
   "files": [