mongodb 3.6.0 → 3.6.4

package/lib/url_parser.js

@@ -1,11 +1,13 @@
 'use strict';
 
-const ReadPreference = require('./core').ReadPreference,
-  parser = require('url'),
-  f = require('util').format,
-  Logger = require('./core').Logger,
-  dns = require('dns');
+const ReadPreference = require('./core').ReadPreference;
+const parser = require('url');
+const f = require('util').format;
+const Logger = require('./core').Logger;
+const dns = require('dns');
 const ReadConcern = require('./read_concern');
+const qs = require('querystring');
+const MongoParseError = require('./core/error').MongoParseError;
 
 module.exports = function(url, options, callback) {
   if (typeof options === 'function') (callback = options), (options = {});
@@ -87,23 +89,26 @@ module.exports = function(url, options, callback) {
     }
 
     dns.resolveTxt(result.host, function(err, record) {
-      if (err && err.code !== 'ENODATA') return callback(err);
+      if (err && err.code !== 'ENODATA' && err.code !== 'ENOTFOUND') return callback(err);
       if (err && err.code === 'ENODATA') record = null;
 
       if (record) {
         if (record.length > 1) {
-          return callback(new Error('Multiple text records not allowed'));
+          return callback(new MongoParseError('Multiple text records not allowed'));
         }
 
-        record = record[0];
-        if (record.length > 1) record = record.join('');
-        else record = record[0];
-
-        if (!record.includes('authSource') && !record.includes('replicaSet')) {
-          return callback(new Error('Text record must only set `authSource` or `replicaSet`'));
+        record = record[0].join('');
+        const parsedRecord = qs.parse(record);
+        const items = Object.keys(parsedRecord);
+        if (items.some(item => item !== 'authSource' && item !== 'replicaSet')) {
+          return callback(
+            new MongoParseError('Text record must only set `authSource` or `replicaSet`')
+          );
         }
 
-        connectionStringOptions.push(record);
+        if (items.length > 0) {
+          connectionStringOptions.push(record);
+        }
       }
 
       // Add any options to the connection string

package/lib/utils.js

@@ -518,6 +518,22 @@ function decorateWithReadConcern(command, coll, options) {
   }
 }
 
+/**
+ * Applies an explain to a given command.
+ * @internal
+ *
+ * @param {object} command - the command on which to apply the explain
+ * @param {Explain} explain - the options containing the explain verbosity
+ * @return the new command
+ */
+function decorateWithExplain(command, explain) {
+  if (command.explain) {
+    return command;
+  }
+
+  return { explain: command, verbosity: explain.verbosity };
+}
+
 const emitProcessWarning = msg => process.emitWarning(msg, 'DeprecationWarning');
 const emitConsoleWarning = msg => console.error(msg);
 const emitDeprecationWarning = process.emitWarning ? emitProcessWarning : emitConsoleWarning;
@@ -565,7 +581,10 @@ function deprecateOptions(config, fn) {
     }
 
     config.deprecatedOptions.forEach(deprecatedOption => {
-      if (options.hasOwnProperty(deprecatedOption) && !optionsWarned.has(deprecatedOption)) {
+      if (
+        Object.prototype.hasOwnProperty.call(options, deprecatedOption) &&
+        !optionsWarned.has(deprecatedOption)
+      ) {
         optionsWarned.add(deprecatedOption);
         const msg = msgHandler(config.name, deprecatedOption);
         emitDeprecationWarning(msg);
@@ -713,12 +732,13 @@ function makeInterruptableAsyncInterval(fn, options) {
   const interval = options.interval || 1000;
   const minInterval = options.minInterval || 500;
   const immediate = typeof options.immediate === 'boolean' ? options.immediate : false;
+  const clock = typeof options.clock === 'function' ? options.clock : now;
 
   function wake() {
-    const currentTime = now();
+    const currentTime = clock();
     const timeSinceLastWake = currentTime - lastWakeTime;
     const timeSinceLastCall = currentTime - lastCallTime;
-    const timeUntilNextCall = Math.max(interval - timeSinceLastCall, 0);
+    const timeUntilNextCall = interval - timeSinceLastCall;
     lastWakeTime = currentTime;
 
     // For the streaming protocol: there is nothing obviously stopping this
@@ -737,6 +757,14 @@ function makeInterruptableAsyncInterval(fn, options) {
     if (timeUntilNextCall > minInterval) {
       reschedule(minInterval);
     }
+
+    // This is possible in virtualized environments like AWS Lambda where our
+    // clock is unreliable. In these cases the timer is "running" but never
+    // actually completes, so we want to execute immediately and then attempt
+    // to reschedule.
+    if (timeUntilNextCall < 0) {
+      executeAndReschedule();
+    }
   }
 
   function stop() {
@@ -758,7 +786,7 @@ function makeInterruptableAsyncInterval(fn, options) {
 
   function executeAndReschedule() {
     lastWakeTime = 0;
-    lastCallTime = now();
+    lastCallTime = clock();
 
     fn(err => {
       if (err) throw err;
@@ -769,7 +797,7 @@ function makeInterruptableAsyncInterval(fn, options) {
   if (immediate) {
     executeAndReschedule();
   } else {
-    lastCallTime = now();
+    lastCallTime = clock();
     reschedule();
   }
 
@@ -781,8 +809,11 @@ function hasAtomicOperators(doc) {
     return doc.reduce((err, u) => err || hasAtomicOperators(u), null);
   }
 
-  const keys = Object.keys(doc);
-  return keys.length > 0 && keys[0][0] === '$';
+  return (
+    Object.keys(typeof doc.toBSON !== 'function' ? doc : doc.toBSON())
+      .map(k => k[0])
+      .indexOf('$') >= 0
+  );
 }
 
 module.exports = {
@@ -808,6 +839,7 @@ module.exports = {
   isPromiseLike,
   decorateWithCollation,
   decorateWithReadConcern,
+  decorateWithExplain,
   deprecateOptions,
   SUPPORTS,
   MongoDBNamespace,

package/lib/write_concern.js

@@ -1,6 +1,6 @@
 'use strict';
 
-const kWriteConcernKeys = new Set(['w', 'wtimeout', 'j', 'fsync']);
+const kWriteConcernKeys = new Set(['w', 'wtimeout', 'j', 'journal', 'fsync']);
 
 /**
  * The **WriteConcern** class is a class that represents a MongoDB WriteConcern.
@@ -37,7 +37,12 @@ class WriteConcern {
   /**
    * Construct a WriteConcern given an options object.
    *
-   * @param {object} options The options object from which to extract the write concern.
+   * @param {object} [options] The options object from which to extract the write concern.
+   * @param {(number|string)} [options.w] **Deprecated** Use `options.writeConcern` instead
+   * @param {number} [options.wtimeout] **Deprecated** Use `options.writeConcern` instead
+   * @param {boolean} [options.j] **Deprecated** Use `options.writeConcern` instead
+   * @param {boolean} [options.fsync] **Deprecated** Use `options.writeConcern` instead
+   * @param {object|WriteConcern} [options.writeConcern] Specify write concern settings.
    * @return {WriteConcern}
    */
   static fromOptions(options) {
@@ -47,6 +52,7 @@ class WriteConcern {
         options.w == null &&
         options.wtimeout == null &&
         options.j == null &&
+        options.journal == null &&
         options.fsync == null)
     ) {
       return;
@@ -64,12 +70,20 @@ class WriteConcern {
       return new WriteConcern(
         options.writeConcern.w,
         options.writeConcern.wtimeout,
-        options.writeConcern.j,
+        options.writeConcern.j || options.writeConcern.journal,
         options.writeConcern.fsync
       );
     }
 
-    return new WriteConcern(options.w, options.wtimeout, options.j, options.fsync);
+    console.warn(
+      `Top-level use of w, wtimeout, j, and fsync is deprecated. Use writeConcern instead.`
+    );
+    return new WriteConcern(
+      options.w,
+      options.wtimeout,
+      options.j || options.journal,
+      options.fsync
+    );
   }
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mongodb",
-  "version": "3.6.0",
+  "version": "3.6.4",
   "description": "The official MongoDB driver for Node.js",
   "main": "index.js",
   "files": [
@@ -23,8 +23,28 @@
     "snappy": "^6.3.4",
     "bson-ext": "^2.0.0"
   },
+  "peerDependenciesMeta": {
+    "kerberos": {
+      "optional": true
+    },
+    "mongodb-client-encryption": {
+      "optional": true
+    },
+    "mongodb-extjson": {
+      "optional": true
+    },
+    "snappy": {
+      "optional": true
+    },
+    "bson-ext": {
+      "optional": true
+    },
+    "aws4": {
+      "optional": true
+    }
+  },
   "dependencies": {
-    "bl": "^2.2.0",
+    "bl": "^2.2.1",
     "bson": "^1.1.4",
     "denque": "^1.4.1",
     "require_optional": "^1.0.1",
@@ -36,8 +56,10 @@
     "chalk": "^2.4.2",
     "co": "4.6.0",
     "coveralls": "^2.11.6",
-    "eslint": "^4.5.0",
-    "eslint-plugin-prettier": "^2.2.0",
+    "eslint": "^7.10.0",
+    "eslint-config-prettier": "^6.11.0",
+    "eslint-plugin-es": "^3.0.1",
+    "eslint-plugin-prettier": "^3.1.3",
     "istanbul": "^0.4.5",
     "jsdoc": "3.5.5",
     "lodash.camelcase": "^4.3.0",
@@ -50,7 +72,8 @@
     "sinon": "^4.3.0",
     "sinon-chai": "^3.2.0",
     "snappy": "^6.3.4",
-    "standard-version": "^4.4.0",
+    "spec-xunit-file": "0.0.1-3",
+    "standard-version": "^8.0.2",
     "util.promisify": "^1.0.1",
     "worker-farm": "^1.5.0",
     "wtfnode": "^0.8.0",
@@ -65,11 +88,14 @@
   },
   "scripts": {
     "atlas": "mocha --opts '{}' ./test/manual/atlas_connectivity.test.js",
-    "test": "npm run lint && mocha --recursive test/functional test/unit test/core",
-    "test-nolint": "mocha --recursive test/functional test/unit test/core",
-    "coverage": "istanbul cover mongodb-test-runner -- -t 60000 test/core test/unit test/functional",
+    "check:kerberos": "mocha --opts '{}' -t 60000 test/manual/kerberos.test.js",
+    "check:ldap": "mocha --opts '{}' test/manual/ldap.test.js",
+    "check:tls": "mocha --opts '{}' test/manual/tls_support.test.js",
+    "test": "npm run lint && mocha --recursive test/functional test/unit",
+    "test-nolint": "mocha --recursive test/functional test/unit",
+    "coverage": "istanbul cover mongodb-test-runner -- -t 60000 test/unit test/functional",
     "lint": "eslint -v && eslint lib test",
-    "format": "prettier --print-width 100 --tab-width 2 --single-quote --write 'test/**/*.js' 'lib/**/*.js'",
+    "format": "npm run lint -- --fix",
     "bench": "node test/benchmarks/driverBench/",
     "generate-evergreen": "node .evergreen/generate_evergreen_tasks.js",
     "release": "standard-version -i HISTORY.md"