mongodb 3.5.9 → 3.6.0

package/lib/topologies/mongos.js

@@ -82,7 +82,7 @@ var legalOptionNames = [
  * @param {object} [options.socketOptions] Socket options
  * @param {boolean} [options.socketOptions.noDelay=true] TCP Socket NoDelay option.
  * @param {boolean} [options.socketOptions.keepAlive=true] TCP Connection keep alive enabled
- * @param {number} [options.socketOptions.keepAliveInitialDelay=30000] The number of milliseconds to wait before initiating keepAlive on the TCP socket
+ * @param {number} [options.socketOptions.keepAliveInitialDelay=120000] The number of milliseconds to wait before initiating keepAlive on the TCP socket
  * @param {number} [options.socketOptions.connectTimeoutMS=10000] How long to wait for a connection to be established before timing out
  * @param {number} [options.socketOptions.socketTimeoutMS=360000] How long a send or receive on a socket can take before timing out
  * @param {boolean} [options.domainsEnabled=false] Enable the wrapping of the callback in the current domain, disabled by default to avoid perf hit.

package/lib/topologies/replset.js

@@ -92,7 +92,7 @@ var legalOptionNames = [
  * @param {object} [options.socketOptions] Socket options
  * @param {boolean} [options.socketOptions.noDelay=true] TCP Socket NoDelay option.
  * @param {boolean} [options.socketOptions.keepAlive=true] TCP Connection keep alive enabled
- * @param {number} [options.socketOptions.keepAliveInitialDelay=30000] The number of milliseconds to wait before initiating keepAlive on the TCP socket
+ * @param {number} [options.socketOptions.keepAliveInitialDelay=120000] The number of milliseconds to wait before initiating keepAlive on the TCP socket
  * @param {number} [options.socketOptions.connectTimeoutMS=10000] How long to wait for a connection to be established before timing out
  * @param {number} [options.socketOptions.socketTimeoutMS=360000] How long a send or receive on a socket can take before timing out
  * @param {boolean} [options.domainsEnabled=false] Enable the wrapping of the callback in the current domain, disabled by default to avoid perf hit.

package/lib/topologies/server.js

@@ -84,7 +84,7 @@ var legalOptionNames = [
  * @param {boolean} [options.socketOptions.autoReconnect=true] Reconnect on error.
  * @param {boolean} [options.socketOptions.noDelay=true] TCP Socket NoDelay option.
  * @param {boolean} [options.socketOptions.keepAlive=true] TCP Connection keep alive enabled
- * @param {number} [options.socketOptions.keepAliveInitialDelay=30000] The number of milliseconds to wait before initiating keepAlive on the TCP socket
+ * @param {number} [options.socketOptions.keepAliveInitialDelay=120000] The number of milliseconds to wait before initiating keepAlive on the TCP socket
  * @param {number} [options.socketOptions.connectTimeoutMS=10000] How long to wait for a connection to be established before timing out
  * @param {number} [options.socketOptions.socketTimeoutMS=360000] How long a send or receive on a socket can take before timing out
  * @param {number} [options.reconnectTries=30] Server attempt to reconnect #times

package/lib/topologies/topology_base.js

@@ -3,7 +3,7 @@
 const EventEmitter = require('events'),
   MongoError = require('../core').MongoError,
   f = require('util').format,
-  translateReadPreference = require('../utils').translateReadPreference,
+  ReadPreference = require('../core').ReadPreference,
   ClientSession = require('../core').Sessions.ClientSession;
 
 // The store of ops
@@ -293,7 +293,7 @@ class TopologyBase extends EventEmitter {
 
   // Command
   command(ns, cmd, options, callback) {
-    this.s.coreTopology.command(ns.toString(), cmd, translateReadPreference(options), callback);
+    this.s.coreTopology.command(ns.toString(), cmd, ReadPreference.translate(options), callback);
   }
 
   // Insert
@@ -314,7 +314,7 @@ class TopologyBase extends EventEmitter {
   // IsConnected
   isConnected(options) {
     options = options || {};
-    options = translateReadPreference(options);
+    options = ReadPreference.translate(options);
 
     return this.s.coreTopology.isConnected(options);
   }
@@ -327,7 +327,7 @@ class TopologyBase extends EventEmitter {
   // Cursor
   cursor(ns, cmd, options) {
     options = options || {};
-    options = translateReadPreference(options);
+    options = ReadPreference.translate(options);
     options.disconnectHandler = this.s.store;
     options.topology = this;
 

package/lib/utils.js

@@ -1,6 +1,5 @@
 'use strict';
 const MongoError = require('./core/error').MongoError;
-const ReadPreference = require('./core/topologies/read_preference');
 const WriteConcern = require('./write_concern');
 
 var shallowClone = function(obj) {
@@ -9,31 +8,6 @@ var shallowClone = function(obj) {
   return copy;
 };
 
-// Figure out the read preference
-var translateReadPreference = function(options) {
-  var r = null;
-  if (options.readPreference) {
-    r = options.readPreference;
-  } else {
-    return options;
-  }
-
-  if (typeof r === 'string') {
-    options.readPreference = new ReadPreference(r);
-  } else if (r && !(r instanceof ReadPreference) && typeof r === 'object') {
-    const mode = r.mode || r.preference;
-    if (mode && typeof mode === 'string') {
-      options.readPreference = new ReadPreference(mode, r.tags, {
-        maxStalenessSeconds: r.maxStalenessSeconds
-      });
-    }
-  } else if (!(r instanceof ReadPreference)) {
-    throw new TypeError('Invalid read preference: ' + r);
-  }
-
-  return options;
-};
-
 // Set simple property
 var getSingleProperty = function(obj, name, value) {
   Object.defineProperty(obj, name, {
@@ -490,37 +464,6 @@ function applyWriteConcern(target, sources, options) {
   return target;
 }
 
-/**
- * Resolves a read preference based on well-defined inheritance rules. This method will not only
- * determine the read preference (if there is one), but will also ensure the returned value is a
- * properly constructed instance of `ReadPreference`.
- *
- * @param {Collection|Db|MongoClient} parent The parent of the operation on which to determine the read
- * preference, used for determining the inherited read preference.
- * @param {Object} options The options passed into the method, potentially containing a read preference
- * @returns {(ReadPreference|null)} The resolved read preference
- */
-function resolveReadPreference(parent, options) {
-  options = options || {};
-  const session = options.session;
-
-  const inheritedReadPreference = parent.readPreference;
-
-  let readPreference;
-  if (options.readPreference) {
-    readPreference = ReadPreference.fromOptions(options);
-  } else if (session && session.inTransaction() && session.transaction.options.readPreference) {
-    // The transaction’s read preference MUST override all other user configurable read preferences.
-    readPreference = session.transaction.options.readPreference;
-  } else if (inheritedReadPreference != null) {
-    readPreference = inheritedReadPreference;
-  } else {
-    throw new Error('No readPreference was provided or inherited.');
-  }
-
-  return typeof readPreference === 'string' ? new ReadPreference(readPreference) : readPreference;
-}
-
 /**
  * Checks if a given value is a Promise
  *
@@ -778,6 +721,12 @@ function makeInterruptableAsyncInterval(fn, options) {
     const timeUntilNextCall = Math.max(interval - timeSinceLastCall, 0);
     lastWakeTime = currentTime;
 
+    // For the streaming protocol: there is nothing obviously stopping this
+    // interval from being woken up again while we are waiting "infinitely"
+    // for `fn` to be called again`. Since the function effectively
+    // never completes, the `timeUntilNextCall` will continue to grow
+    // negatively unbounded, so it will never trigger a reschedule here.
+
     // debounce multiple calls to wake within the `minInterval`
     if (timeSinceLastWake < minInterval) {
       return;
@@ -810,6 +759,7 @@ function makeInterruptableAsyncInterval(fn, options) {
   function executeAndReschedule() {
     lastWakeTime = 0;
     lastCallTime = now();
+
     fn(err => {
       if (err) throw err;
       reschedule(interval);
@@ -826,6 +776,15 @@ function makeInterruptableAsyncInterval(fn, options) {
   return { wake, stop };
 }
 
+function hasAtomicOperators(doc) {
+  if (Array.isArray(doc)) {
+    return doc.reduce((err, u) => err || hasAtomicOperators(u), null);
+  }
+
+  const keys = Object.keys(doc);
+  return keys.length > 0 && keys[0][0] === '$';
+}
+
 module.exports = {
   filterOptions,
   mergeOptions,
@@ -843,7 +802,6 @@ module.exports = {
   debugOptions,
   MAX_JS_INT: Number.MAX_SAFE_INTEGER + 1,
   mergeOptionsAndWriteConcern,
-  translateReadPreference,
   executeLegacyOperation,
   applyRetryableWrites,
   applyWriteConcern,
@@ -853,11 +811,11 @@ module.exports = {
   deprecateOptions,
   SUPPORTS,
   MongoDBNamespace,
-  resolveReadPreference,
   emitDeprecationWarning,
   makeCounter,
   maybePromise,
   now,
   calculateDurationInMs,
-  makeInterruptableAsyncInterval
+  makeInterruptableAsyncInterval,
+  hasAtomicOperators
 };

package/lib/write_concern.js

@@ -1,5 +1,7 @@
 'use strict';
 
+const kWriteConcernKeys = new Set(['w', 'wtimeout', 'j', 'fsync']);
+
 /**
  * The **WriteConcern** class is a class that represents a MongoDB WriteConcern.
  * @class
@@ -51,6 +53,14 @@ class WriteConcern {
     }
 
     if (options.writeConcern) {
+      if (typeof options.writeConcern === 'string') {
+        return new WriteConcern(options.writeConcern);
+      }
+
+      if (!Object.keys(options.writeConcern).some(key => kWriteConcernKeys.has(key))) {
+        return;
+      }
+
       return new WriteConcern(
         options.writeConcern.w,
         options.writeConcern.wtimeout,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mongodb",
-  "version": "3.5.9",
+  "version": "3.6.0",
   "description": "The official MongoDB driver for Node.js",
   "main": "index.js",
   "files": [
@@ -64,7 +64,7 @@
     "url": "https://github.com/mongodb/node-mongodb-native/issues"
   },
   "scripts": {
-    "atlas": "node ./test/tools/atlas_connectivity_tests.js",
+    "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",

package/lib/core/auth/sspi.js

@@ -1,131 +0,0 @@
-'use strict';
-
-const AuthProvider = require('./auth_provider').AuthProvider;
-const retrieveKerberos = require('../utils').retrieveKerberos;
-let kerberos;
-
-/**
- * Creates a new SSPI authentication mechanism
- * @class
- * @extends AuthProvider
- */
-class SSPI extends AuthProvider {
-  /**
-   * Implementation of authentication for a single connection
-   * @override
-   */
-  _authenticateSingleConnection(sendAuthCommand, connection, credentials, callback) {
-    // TODO: Destructure this
-    const username = credentials.username;
-    const password = credentials.password;
-    const mechanismProperties = credentials.mechanismProperties;
-    const gssapiServiceName =
-      mechanismProperties['gssapiservicename'] ||
-      mechanismProperties['gssapiServiceName'] ||
-      'mongodb';
-
-    SSIPAuthenticate(
-      this,
-      kerberos.processes.MongoAuthProcess,
-      username,
-      password,
-      gssapiServiceName,
-      sendAuthCommand,
-      connection,
-      mechanismProperties,
-      callback
-    );
-  }
-
-  /**
-   * Authenticate
-   * @override
-   * @method
-   */
-  auth(sendAuthCommand, connections, credentials, callback) {
-    if (kerberos == null) {
-      try {
-        kerberos = retrieveKerberos();
-      } catch (e) {
-        return callback(e, null);
-      }
-    }
-
-    super.auth(sendAuthCommand, connections, credentials, callback);
-  }
-}
-
-function SSIPAuthenticate(
-  self,
-  MongoAuthProcess,
-  username,
-  password,
-  gssapiServiceName,
-  sendAuthCommand,
-  connection,
-  options,
-  callback
-) {
-  const authProcess = new MongoAuthProcess(
-    connection.host,
-    connection.port,
-    gssapiServiceName,
-    options
-  );
-
-  function authCommand(command, authCb) {
-    sendAuthCommand(connection, '$external.$cmd', command, authCb);
-  }
-
-  authProcess.init(username, password, err => {
-    if (err) return callback(err, false);
-
-    authProcess.transition('', (err, payload) => {
-      if (err) return callback(err, false);
-
-      const command = {
-        saslStart: 1,
-        mechanism: 'GSSAPI',
-        payload,
-        autoAuthorize: 1
-      };
-
-      authCommand(command, (err, doc) => {
-        if (err) return callback(err, false);
-
-        authProcess.transition(doc.payload, (err, payload) => {
-          if (err) return callback(err, false);
-          const command = {
-            saslContinue: 1,
-            conversationId: doc.conversationId,
-            payload
-          };
-
-          authCommand(command, (err, doc) => {
-            if (err) return callback(err, false);
-
-            authProcess.transition(doc.payload, (err, payload) => {
-              if (err) return callback(err, false);
-              const command = {
-                saslContinue: 1,
-                conversationId: doc.conversationId,
-                payload
-              };
-
-              authCommand(command, (err, response) => {
-                if (err) return callback(err, false);
-
-                authProcess.transition(null, err => {
-                  if (err) return callback(err, null);
-                  callback(null, response);
-                });
-              });
-            });
-          });
-        });
-      });
-    });
-  });
-}
-
-module.exports = SSPI;

package/lib/operations/create_index.js

@@ -1,92 +0,0 @@
-'use strict';
-
-const Aspect = require('./operation').Aspect;
-const CommandOperation = require('./command');
-const defineAspects = require('./operation').defineAspects;
-const handleCallback = require('../utils').handleCallback;
-const MongoError = require('../core').MongoError;
-const parseIndexOptions = require('../utils').parseIndexOptions;
-
-const keysToOmit = new Set([
-  'name',
-  'key',
-  'writeConcern',
-  'w',
-  'wtimeout',
-  'j',
-  'fsync',
-  'readPreference',
-  'session'
-]);
-
-class CreateIndexOperation extends CommandOperation {
-  constructor(db, name, fieldOrSpec, options) {
-    super(db, options);
-
-    // Build the index
-    const indexParameters = parseIndexOptions(fieldOrSpec);
-    // Generate the index name
-    const indexName = typeof options.name === 'string' ? options.name : indexParameters.name;
-    // Set up the index
-    const indexesObject = { name: indexName, key: indexParameters.fieldHash };
-
-    this.name = name;
-    this.fieldOrSpec = fieldOrSpec;
-    this.indexes = indexesObject;
-  }
-
-  _buildCommand() {
-    const options = this.options;
-    const name = this.name;
-    const indexes = this.indexes;
-
-    // merge all the options
-    for (let optionName in options) {
-      if (!keysToOmit.has(optionName)) {
-        indexes[optionName] = options[optionName];
-      }
-    }
-
-    // Create command, apply write concern to command
-    const cmd = { createIndexes: name, indexes: [indexes] };
-
-    return cmd;
-  }
-
-  execute(callback) {
-    const db = this.db;
-    const options = this.options;
-    const indexes = this.indexes;
-
-    // Get capabilities
-    const capabilities = db.s.topology.capabilities();
-
-    // Did the user pass in a collation, check if our write server supports it
-    if (options.collation && capabilities && !capabilities.commandsTakeCollation) {
-      // Create a new error
-      const error = new MongoError('server/primary/mongos does not support collation');
-      error.code = 67;
-      // Return the error
-      return callback(error);
-    }
-
-    // Ensure we have a callback
-    if (options.writeConcern && typeof callback !== 'function') {
-      throw MongoError.create({
-        message: 'Cannot use a writeConcern without a provided callback',
-        driver: true
-      });
-    }
-
-    // Attempt to run using createIndexes command
-    super.execute((err, result) => {
-      if (err == null) return handleCallback(callback, err, indexes.name);
-
-      return handleCallback(callback, err, result);
-    });
-  }
-}
-
-defineAspects(CreateIndexOperation, Aspect.WRITE_OPERATION);
-
-module.exports = CreateIndexOperation;