mongodb 3.6.11 → 3.6.12

package/lib/core/auth/mongo_credentials.js

@@ -58,7 +58,10 @@ class MongoCredentials {
         this.password = process.env.AWS_SECRET_ACCESS_KEY;
       }
 
-      if (!this.mechanismProperties.AWS_SESSION_TOKEN && process.env.AWS_SESSION_TOKEN) {
+      if (
+        this.mechanismProperties.AWS_SESSION_TOKEN == null &&
+        process.env.AWS_SESSION_TOKEN != null
+      ) {
         this.mechanismProperties.AWS_SESSION_TOKEN = process.env.AWS_SESSION_TOKEN;
       }
     }

package/lib/core/auth/mongodb_aws.js

@@ -51,12 +51,21 @@ class MongoDBAWS extends AuthProvider {
       return;
     }
 
-    const username = credentials.username;
-    const password = credentials.password;
     const db = credentials.source;
-    const token = credentials.mechanismProperties.AWS_SESSION_TOKEN;
     const bson = this.bson;
 
+    const accessKeyId = credentials.username;
+    const secretAccessKey = credentials.password;
+    const sessionToken = credentials.mechanismProperties.AWS_SESSION_TOKEN;
+
+    // If all three defined, include sessionToken, else include username and pass, else no credentials
+    const awsCredentials =
+      accessKeyId && secretAccessKey && sessionToken
+        ? { accessKeyId, secretAccessKey, sessionToken }
+        : accessKeyId && secretAccessKey
+        ? { accessKeyId, secretAccessKey }
+        : undefined;
+
     crypto.randomBytes(32, (err, nonce) => {
       if (err) {
         callback(err);
@@ -109,18 +118,14 @@ class MongoDBAWS extends AuthProvider {
             path: '/',
             body
           },
-          {
-            accessKeyId: username,
-            secretAccessKey: password,
-            token
-          }
+          awsCredentials
         );
 
         const authorization = options.headers.Authorization;
         const date = options.headers['X-Amz-Date'];
         const payload = { a: authorization, d: date };
-        if (token) {
-          payload.t = token;
+        if (sessionToken) {
+          payload.t = sessionToken;
         }
 
         const saslContinue = {
@@ -164,6 +169,7 @@ function makeTempCredentials(credentials, callback) {
   if (process.env.AWS_CONTAINER_CREDENTIALS_RELATIVE_URI) {
     request(
       `${AWS_RELATIVE_URI}${process.env.AWS_CONTAINER_CREDENTIALS_RELATIVE_URI}`,
+      undefined,
       (err, res) => {
         if (err) return callback(err);
         done(res);
@@ -215,11 +221,6 @@ function deriveRegion(host) {
 }
 
 function request(uri, options, callback) {
-  if (typeof options === 'function') {
-    callback = options;
-    options = {};
-  }
-
   options = Object.assign(
     {
       method: 'GET',

package/lib/core/connection/connection.js

@@ -190,6 +190,7 @@ class Connection extends EventEmitter {
    * Unref this connection
    * @method
    * @return {boolean}
+   * @deprecated This function is deprecated and will be removed in the next major version.
    */
   unref() {
     if (this.socket == null) {

package/lib/core/connection/pool.js

@@ -604,6 +604,7 @@ Pool.prototype.logout = function(dbName, callback) {
 /**
  * Unref the pool
  * @method
+ * @deprecated This function is deprecated and will be removed in the next major version.
  */
 Pool.prototype.unref = function() {
   // Get all the known connections

package/lib/core/connection/utils.js

@@ -1,5 +1,8 @@
 'use strict';
 
+const parsePackageVersion = require('../../utils').parsePackageVersion;
+const MongoError = require('../error').MongoError;
+
 const require_optional = require('optional-require')(require);
 
 function debugOptions(debugFields, options) {
@@ -16,7 +19,15 @@ function retrieveBSON() {
   BSON.native = false;
 
   const optionalBSON = require_optional('bson-ext');
+  const bsonExtVersion = parsePackageVersion(
+    require_optional('bson-ext/package.json') || { version: '0.0.0' }
+  );
   if (optionalBSON) {
+    if (bsonExtVersion.major >= 4) {
+      throw new MongoError(
+        'bson-ext version 4 and above does not work with the 3.x version of the mongodb driver'
+      );
+    }
     optionalBSON.native = true;
     return optionalBSON;
   }
@@ -31,21 +42,43 @@ function noSnappyWarning() {
   );
 }
 
+const PKG_VERSION = Symbol('kPkgVersion');
+
 // Facilitate loading Snappy optionally
 function retrieveSnappy() {
-  let snappy = require_optional('snappy');
+  const snappy = require_optional('snappy');
   if (!snappy) {
-    snappy = {
+    return {
       compress: noSnappyWarning,
       uncompress: noSnappyWarning,
       compressSync: noSnappyWarning,
       uncompressSync: noSnappyWarning
     };
   }
+
+  const snappyPkg = require_optional('snappy/package.json') || { version: '0.0.0' };
+  const version = parsePackageVersion(snappyPkg);
+  snappy[PKG_VERSION] = version;
+  if (version.major >= 7) {
+    const compressOriginal = snappy.compress;
+    const uncompressOriginal = snappy.uncompress;
+    snappy.compress = (data, callback) => {
+      compressOriginal(data)
+        .then(res => callback(undefined, res))
+        .catch(error => callback(error));
+    };
+    snappy.uncompress = (data, callback) => {
+      uncompressOriginal(data)
+        .then(res => callback(undefined, res))
+        .catch(error => callback(error));
+    };
+  }
+
   return snappy;
 }
 
 module.exports = {
+  PKG_VERSION,
   debugOptions,
   retrieveBSON,
   retrieveSnappy

package/lib/core/sdam/topology.js

@@ -742,8 +742,11 @@ class Topology extends EventEmitter {
     return this.s.state === STATE_CLOSED;
   }
 
+  /**
+   * @deprecated This function is deprecated and will be removed in the next major version.
+   */
   unref() {
-    emitWarning('not implemented: `unref`');
+    emitWarning('`unref` is a noop and will be removed in the next major version');
   }
 
   // NOTE: There are many places in code where we explicitly check the last isMaster

package/lib/db.js

@@ -951,6 +951,7 @@ Db.prototype.indexInformation = function(name, options, callback) {
 /**
  * Unref all sockets
  * @method
+ * @deprecated This function is deprecated and will be removed in the next major version.
  */
 Db.prototype.unref = function() {
   this.s.topology.unref();

package/lib/utils.js

@@ -946,6 +946,14 @@ function deepCopy(value) {
 
   return value;
 }
+/**
+ * @param {{version: string}} pkg
+ * @returns {{ major: number; minor: number; patch: number }}
+ */
+function parsePackageVersion(pkg) {
+  const versionParts = pkg.version.split('.').map(n => Number.parseInt(n, 10));
+  return { major: versionParts[0], minor: versionParts[1], patch: versionParts[2] };
+}
 
 module.exports = {
   filterOptions,
@@ -984,5 +992,6 @@ module.exports = {
   MONGODB_WARNING_CODE,
   emitWarning,
   emitWarningOnce,
-  deepCopy
+  deepCopy,
+  parsePackageVersion
 };

package/package.json

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