mongodb 3.6.3 → 3.6.4

package/lib/core/sdam/monitor.js

@@ -118,7 +118,8 @@ class Monitor extends EventEmitter {
   }
 
   reset() {
-    if (isInCloseState(this)) {
+    const topologyVersion = this[kServer].description.topologyVersion;
+    if (isInCloseState(this) || topologyVersion == null) {
       return;
     }
 
@@ -152,7 +153,6 @@ class Monitor extends EventEmitter {
 }
 
 function resetMonitorState(monitor) {
-  stateTransition(monitor, STATE_CLOSING);
   if (monitor[kMonitorId]) {
     monitor[kMonitorId].stop();
     monitor[kMonitorId] = null;
@@ -200,16 +200,19 @@ function checkServer(monitor, callback) {
     const topologyVersion = monitor[kServer].description.topologyVersion;
     const isAwaitable = topologyVersion != null;
 
-    const cmd = isAwaitable
-      ? { ismaster: true, maxAwaitTimeMS, topologyVersion: makeTopologyVersion(topologyVersion) }
-      : { ismaster: true };
-
-    const options = isAwaitable
-      ? { socketTimeout: connectTimeoutMS + maxAwaitTimeMS, exhaustAllowed: true }
-      : { socketTimeout: connectTimeoutMS };
+    const cmd = { ismaster: true };
+    const options = { socketTimeout: connectTimeoutMS };
 
-    if (isAwaitable && monitor[kRTTPinger] == null) {
-      monitor[kRTTPinger] = new RTTPinger(monitor[kCancellationToken], monitor.connectOptions);
+    if (isAwaitable) {
+      cmd.maxAwaitTimeMS = maxAwaitTimeMS;
+      cmd.topologyVersion = makeTopologyVersion(topologyVersion);
+      if (connectTimeoutMS) {
+        options.socketTimeout = connectTimeoutMS + maxAwaitTimeMS;
+      }
+      options.exhaustAllowed = true;
+      if (monitor[kRTTPinger] == null) {
+        monitor[kRTTPinger] = new RTTPinger(monitor[kCancellationToken], monitor.connectOptions);
+      }
     }
 
     monitor[kConnection].command('admin.$cmd', cmd, options, (err, result) => {

package/lib/core/sdam/topology.js

@@ -930,7 +930,8 @@ function executeWriteOperation(args, options, callback) {
     !!options.retryWrites &&
     options.session &&
     isRetryableWritesSupported(topology) &&
-    !options.session.inTransaction();
+    !options.session.inTransaction() &&
+    options.explain === undefined;
 
   topology.selectServer(writableServerSelector(), options, (err, server) => {
     if (err) {

package/lib/core/topologies/mongos.js

@@ -919,7 +919,8 @@ function executeWriteOperation(args, options, callback) {
     !!options.retryWrites &&
     options.session &&
     isRetryableWritesSupported(self) &&
-    !options.session.inTransaction();
+    !options.session.inTransaction() &&
+    options.explain === undefined;
 
   const handler = (err, result) => {
     if (!err) return callback(null, result);

package/lib/core/topologies/replset.js

@@ -541,7 +541,7 @@ var monitorServer = function(host, self, options) {
               self.s.options.secondaryOnlyConnectionAllowed) ||
               self.s.replicaSetState.hasPrimary())
           ) {
-            self.state = CONNECTED;
+            stateTransition(self, CONNECTED);
 
             // Emit connected sign
             process.nextTick(function() {
@@ -558,7 +558,7 @@ var monitorServer = function(host, self, options) {
               self.s.options.secondaryOnlyConnectionAllowed) ||
               self.s.replicaSetState.hasPrimary())
           ) {
-            self.state = CONNECTED;
+            stateTransition(self, CONNECTED);
 
             // Rexecute any stalled operation
             rexecuteOperations(self);
@@ -787,7 +787,7 @@ function handleInitialConnectEvent(self, event) {
         // Do we have a primary or primaryAndSecondary
         if (shouldTriggerConnect(self)) {
           // We are connected
-          self.state = CONNECTED;
+          stateTransition(self, CONNECTED);
 
           // Set initial connect state
           self.initialConnectState.connect = true;
@@ -975,14 +975,19 @@ ReplSet.prototype.destroy = function(options, callback) {
     // Emit toplogy closing event
     emitSDAMEvent(this, 'topologyClosed', { topologyId: this.id });
 
-    // Transition state
-    stateTransition(this, DESTROYED);
-
     if (typeof callback === 'function') {
       callback(null, null);
     }
   };
 
+  if (this.state === DESTROYED) {
+    if (typeof callback === 'function') callback(null, null);
+    return;
+  }
+
+  // Transition state
+  stateTransition(this, DESTROYED);
+
   // Clear out any monitoring process
   if (this.haTimeoutId) clearTimeout(this.haTimeoutId);
 
@@ -1188,7 +1193,8 @@ function executeWriteOperation(args, options, callback) {
     !!options.retryWrites &&
     options.session &&
     isRetryableWritesSupported(self) &&
-    !options.session.inTransaction();
+    !options.session.inTransaction() &&
+    options.explain === undefined;
 
   if (!self.s.replicaSetState.hasPrimary()) {
     if (self.s.disconnectHandler) {

package/lib/core/topologies/server.js

@@ -864,12 +864,14 @@ Server.prototype.destroy = function(options, callback) {
   }
 
   // No pool, return
-  if (!self.s.pool) {
+  if (!self.s.pool || this._destroyed) {
     this._destroyed = true;
     if (typeof callback === 'function') callback(null, null);
     return;
   }
 
+  this._destroyed = true;
+
   // Emit close event
   if (options.emitClose) {
     self.emit('close', self);
@@ -900,7 +902,6 @@ Server.prototype.destroy = function(options, callback) {
 
   // Destroy the pool
   this.s.pool.destroy(options.force, callback);
-  this._destroyed = true;
 };
 
 /**

package/lib/core/uri_parser.js

@@ -11,6 +11,11 @@ const ReadPreference = require('./topologies/read_preference');
  */
 const HOSTS_RX = /(mongodb(?:\+srv|)):\/\/(?: (?:[^:]*) (?: : ([^@]*) )? @ )?([^/?]*)(?:\/|)(.*)/;
 
+// Options that reference file paths should not be parsed
+const FILE_PATH_OPTIONS = new Set(
+  ['sslCA', 'sslCert', 'sslKey', 'tlsCAFile', 'tlsCertificateKeyFile'].map(key => key.toLowerCase())
+);
+
 /**
  * Determines whether a provided address matches the provided parent domain in order
  * to avoid certain attack vectors.
@@ -86,7 +91,7 @@ function parseSrvConnectionString(uri, options, callback) {
     // Resolve TXT record and add options from there if they exist.
     dns.resolveTxt(lookupAddress, (err, record) => {
       if (err) {
-        if (err.code !== 'ENODATA') {
+        if (err.code !== 'ENODATA' && err.code !== 'ENOTFOUND') {
           return callback(err);
         }
         record = null;
@@ -424,7 +429,9 @@ function parseQueryString(query, options) {
     }
 
     const normalizedKey = key.toLowerCase();
-    const parsedValue = parseQueryStringItemValue(normalizedKey, value);
+    const parsedValue = FILE_PATH_OPTIONS.has(normalizedKey)
+      ? value
+      : parseQueryStringItemValue(normalizedKey, value);
     applyConnectionStringOption(result, normalizedKey, parsedValue, options);
   }
 
@@ -687,6 +694,15 @@ function parseConnectionString(uri, options, callback) {
     return callback(new MongoParseError('directConnection option requires exactly one host'));
   }
 
+  // NOTE: this behavior will go away in v4.0, we will always auto discover there
+  if (
+    parsedOptions.directConnection == null &&
+    hosts.length === 1 &&
+    parsedOptions.replicaSet == null
+  ) {
+    parsedOptions.directConnection = true;
+  }
+
   const result = {
     hosts: hosts,
     auth: auth.db || auth.username ? auth : null,

package/lib/core/wireprotocol/query.js

@@ -8,6 +8,8 @@ const isSharded = require('./shared').isSharded;
 const maxWireVersion = require('../utils').maxWireVersion;
 const applyCommonQueryOptions = require('./shared').applyCommonQueryOptions;
 const command = require('./command');
+const decorateWithExplain = require('../../utils').decorateWithExplain;
+const Explain = require('../../explain').Explain;
 
 function query(server, ns, cmd, cursorState, options, callback) {
   options = options || {};
@@ -31,7 +33,14 @@ function query(server, ns, cmd, cursorState, options, callback) {
   }
 
   const readPreference = getReadPreference(cmd, options);
-  const findCmd = prepareFindCommand(server, ns, cmd, cursorState, options);
+  let findCmd = prepareFindCommand(server, ns, cmd, cursorState, options);
+
+  // If we have explain, we need to rewrite the find command
+  // to wrap it in the explain command
+  const explain = Explain.fromOptions(options);
+  if (explain) {
+    findCmd = decorateWithExplain(findCmd, explain);
+  }
 
   // NOTE: This actually modifies the passed in cmd, and our code _depends_ on this
   //       side-effect. Change this ASAP
@@ -59,7 +68,7 @@ function query(server, ns, cmd, cursorState, options, callback) {
 
 function prepareFindCommand(server, ns, cmd, cursorState) {
   cursorState.batchSize = cmd.batchSize || cursorState.batchSize;
-  let findCmd = {
+  const findCmd = {
     find: collectionNamespace(ns)
   };
 
@@ -143,14 +152,6 @@ function prepareFindCommand(server, ns, cmd, cursorState) {
   if (cmd.collation) findCmd.collation = cmd.collation;
   if (cmd.readConcern) findCmd.readConcern = cmd.readConcern;
 
-  // If we have explain, we need to rewrite the find command
-  // to wrap it in the explain command
-  if (cmd.explain) {
-    findCmd = {
-      explain: findCmd
-    };
-  }
-
   return findCmd;
 }
 
@@ -188,7 +189,7 @@ function prepareLegacyFindQuery(server, ns, cmd, cursorState, options) {
   if (typeof cmd.showDiskLoc !== 'undefined') findCmd['$showDiskLoc'] = cmd.showDiskLoc;
   if (cmd.comment) findCmd['$comment'] = cmd.comment;
   if (cmd.maxTimeMS) findCmd['$maxTimeMS'] = cmd.maxTimeMS;
-  if (cmd.explain) {
+  if (options.explain !== undefined) {
     // nToReturn must be 0 (match all) or negative (match N and close cursor)
     // nToReturn > 0 will give explain results equivalent to limit(0)
     numberToReturn = -Math.abs(cmd.limit || 0);

package/lib/core/wireprotocol/write_command.js

@@ -3,6 +3,8 @@
 const MongoError = require('../error').MongoError;
 const collectionNamespace = require('./shared').collectionNamespace;
 const command = require('./command');
+const decorateWithExplain = require('../../utils').decorateWithExplain;
+const Explain = require('../../explain').Explain;
 
 function writeCommand(server, type, opsField, ns, ops, options, callback) {
   if (ops.length === 0) throw new MongoError(`${type} must contain at least one document`);
@@ -15,7 +17,7 @@ function writeCommand(server, type, opsField, ns, ops, options, callback) {
   const ordered = typeof options.ordered === 'boolean' ? options.ordered : true;
   const writeConcern = options.writeConcern;
 
-  const writeCommand = {};
+  let writeCommand = {};
   writeCommand[type] = collectionNamespace(ns);
   writeCommand[opsField] = ops;
   writeCommand.ordered = ordered;
@@ -36,6 +38,13 @@ function writeCommand(server, type, opsField, ns, ops, options, callback) {
     writeCommand.bypassDocumentValidation = options.bypassDocumentValidation;
   }
 
+  // If a command is to be explained, we need to reformat the command after
+  // the other command properties are specified.
+  const explain = Explain.fromOptions(options);
+  if (explain) {
+    writeCommand = decorateWithExplain(writeCommand, explain);
+  }
+
   const commandOptions = Object.assign(
     {
       checkKeys: type === 'insert',

package/lib/cursor.js

@@ -12,6 +12,8 @@ const Map = require('./core').BSON.Map;
 const maybePromise = require('./utils').maybePromise;
 const executeOperation = require('./operations/execute_operation');
 const formattedOrderClause = require('./utils').formattedOrderClause;
+const Explain = require('./explain').Explain;
+const Aspect = require('./operations/operation').Aspect;
 
 const each = require('./operations/cursor_ops').each;
 const CountOperation = require('./operations/count');
@@ -999,25 +1001,25 @@ class Cursor extends CoreCursor {
 
   /**
    * Execute the explain for the cursor
+   *
+   * For backwards compatibility, a verbosity of true is interpreted as "allPlansExecution"
+   * and false as "queryPlanner". Prior to server version 3.6, aggregate()
+   * ignores the verbosity parameter and executes in "queryPlanner".
+   *
    * @method
+   * @param {'queryPlanner'|'queryPlannerExtended'|'executionStats'|'allPlansExecution'|boolean} [verbosity=true] - An optional mode in which to run the explain.
    * @param {Cursor~resultCallback} [callback] The result callback.
    * @return {Promise} returns Promise if no callback passed
    */
-  explain(callback) {
-    // NOTE: the next line includes a special case for operations which do not
-    //       subclass `CommandOperationV2`. To be removed asap.
-    if (this.operation && this.operation.cmd == null) {
-      this.operation.options.explain = true;
-      this.operation.fullResponse = false;
-      return executeOperation(this.topology, this.operation, callback);
-    }
-
-    this.cmd.explain = true;
+  explain(verbosity, callback) {
+    if (typeof verbosity === 'function') (callback = verbosity), (verbosity = true);
+    if (verbosity === undefined) verbosity = true;
 
-    // Do we have a readConcern
-    if (this.cmd.readConcern) {
-      delete this.cmd['readConcern'];
+    if (!this.operation || !this.operation.hasAspect(Aspect.EXPLAINABLE)) {
+      throw new MongoError('This command cannot be explained');
     }
+    this.operation.explain = new Explain(verbosity);
+
     return maybePromise(this, callback, cb => {
       CoreCursor.prototype._next.apply(this, [cb]);
     });

package/lib/db.js

@@ -72,6 +72,7 @@ const legalOptionNames = [
   'wtimeout',
   'fsync',
   'j',
+  'writeConcern',
   'readPreference',
   'readPreferenceTags',
   'native_parser',
@@ -105,9 +106,10 @@ const legalOptionNames = [
  * @param {(Server|ReplSet|Mongos)} topology The server topology for the database.
  * @param {object} [options] Optional settings.
  * @param {string} [options.authSource] If the database authentication is dependent on another databaseName.
- * @param {(number|string)} [options.w] The write concern.
- * @param {number} [options.wtimeout] The write concern timeout.
- * @param {boolean} [options.j=false] Specify a journal write concern.
+ * @param {(number|string)} [options.w] **Deprecated** The write concern. Use writeConcern instead.
+ * @param {number} [options.wtimeout] **Deprecated** The write concern timeout. Use writeConcern instead.
+ * @param {boolean} [options.j=false] **Deprecated** Specify a journal write concern. Use writeConcern instead.
+ * @param {object|WriteConcern} [options.writeConcern] Specify write concern settings.
  * @param {boolean} [options.forceServerObjectId=false] Force server to assign _id values instead of driver.
  * @param {boolean} [options.serializeFunctions=false] Serialize functions on any object.
  * @param {Boolean} [options.ignoreUndefined=false] Specify if the BSON serializer should ignore undefined fields.
@@ -211,6 +213,14 @@ function Db(databaseName, topology, options) {
 
 inherits(Db, EventEmitter);
 
+Db.prototype.on = deprecate(function() {
+  return Db.super_.prototype.on.apply(this, arguments);
+}, 'Listening to events on the Db class has been deprecated and will be removed in the next major version.');
+
+Db.prototype.once = deprecate(function() {
+  return Db.super_.prototype.once.apply(this, arguments);
+}, 'Listening to events on the Db class has been deprecated and will be removed in the next major version.');
+
 // Topology
 Object.defineProperty(Db.prototype, 'topology', {
   enumerable: true,
@@ -304,7 +314,7 @@ Db.prototype.command = function(command, options, callback) {
  * @param {number} [options.batchSize=1000] The number of documents to return per batch. See {@link https://docs.mongodb.com/manual/reference/command/aggregate|aggregation documentation}.
  * @param {object} [options.cursor] Return the query as cursor, on 2.6 > it returns as a real cursor on pre 2.6 it returns as an emulated cursor.
  * @param {number} [options.cursor.batchSize=1000] Deprecated. Use `options.batchSize`
- * @param {boolean} [options.explain=false] Explain returns the aggregation execution plan (requires mongodb 2.6 >).
+ * @param {'queryPlanner'|'queryPlannerExtended'|'executionStats'|'allPlansExecution'|boolean} [options.explain] The verbosity mode for the explain output.
  * @param {boolean} [options.allowDiskUse=false] allowDiskUse lets the server know if it can use disk to store temporary results for the aggregation (requires mongodb 2.6 >).
  * @param {number} [options.maxTimeMS] maxTimeMS specifies a cumulative time limit in milliseconds for processing operations on the cursor. MongoDB interrupts the operation at the earliest following interrupt point.
  * @param {number} [options.maxAwaitTimeMS] The maximum amount of time for the server to wait on new documents to satisfy a tailable cursor query.
@@ -391,9 +401,10 @@ const collectionKeys = [
  * @method
  * @param {string} name the collection name we wish to access.
  * @param {object} [options] Optional settings.
- * @param {(number|string)} [options.w] The write concern.
- * @param {number} [options.wtimeout] The write concern timeout.
- * @param {boolean} [options.j=false] Specify a journal write concern.
+ * @param {(number|string)} [options.w] **Deprecated** The write concern. Use writeConcern instead.
+ * @param {number} [options.wtimeout] **Deprecated** The write concern timeout. Use writeConcern instead.
+ * @param {boolean} [options.j=false] **Deprecated** Specify a journal write concern. Use writeConcern instead.
+ * @param {object|WriteConcern} [options.writeConcern] Specify write concern settings.
  * @param {boolean} [options.raw=false] Return document results as raw BSON buffers.
  * @param {object} [options.pkFactory] A primary key factory object for generation of custom _id keys.
  * @param {(ReadPreference|string)} [options.readPreference] The preferred read preference (ReadPreference.PRIMARY, ReadPreference.PRIMARY_PREFERRED, ReadPreference.SECONDARY, ReadPreference.SECONDARY_PREFERRED, ReadPreference.NEAREST).
@@ -485,9 +496,10 @@ Db.prototype.collection = function(name, options, callback) {
  * @method
  * @param {string} name the collection name we wish to access.
  * @param {object} [options] Optional settings.
- * @param {(number|string)} [options.w] The write concern.
- * @param {number} [options.wtimeout] The write concern timeout.
- * @param {boolean} [options.j=false] Specify a journal write concern.
+ * @param {(number|string)} [options.w] **Deprecated** The write concern. Use writeConcern instead.
+ * @param {number} [options.wtimeout] **Deprecated** The write concern timeout. Use writeConcern instead.
+ * @param {boolean} [options.j=false] **Deprecated** Specify a journal write concern. Use writeConcern instead.
+ * @param {object|WriteConcern} [options.writeConcern] Specify write concern settings.
  * @param {boolean} [options.raw=false] Return document results as raw BSON buffers.
  * @param {object} [options.pkFactory] A primary key factory object for generation of custom _id keys.
  * @param {(ReadPreference|string)} [options.readPreference] The preferred read preference (ReadPreference.PRIMARY, ReadPreference.PRIMARY_PREFERRED, ReadPreference.SECONDARY, ReadPreference.SECONDARY_PREFERRED, ReadPreference.NEAREST).
@@ -513,7 +525,7 @@ Db.prototype.collection = function(name, options, callback) {
 Db.prototype.createCollection = deprecateOptions(
   {
     name: 'Db.createCollection',
-    deprecatedOptions: ['autoIndexId', 'strict'],
+    deprecatedOptions: ['autoIndexId', 'strict', 'w', 'wtimeout', 'j'],
     optionsIndex: 1
   },
   function(name, options, callback) {
@@ -643,10 +655,10 @@ Db.prototype.renameCollection = function(fromCollection, toCollection, options,
  * @method
  * @param {string} name Name of collection to drop
  * @param {Object} [options] Optional settings
- * @param {WriteConcern} [options.writeConcern] A full WriteConcern object
- * @param {(number|string)} [options.w] The write concern
- * @param {number} [options.wtimeout] The write concern timeout
- * @param {boolean} [options.j] The journal write concern
+ * @param {(number|string)} [options.w] **Deprecated** The write concern. Use writeConcern instead.
+ * @param {number} [options.wtimeout] **Deprecated** The write concern timeout. Use writeConcern instead.
+ * @param {boolean} [options.j=false] **Deprecated** Specify a journal write concern. Use writeConcern instead.
+ * @param {object|WriteConcern} [options.writeConcern] Specify write concern settings.
  * @param {ClientSession} [options.session] optional session to use for this operation
  * @param {Db~resultCallback} [callback] The results callback
  * @return {Promise} returns Promise if no callback passed
@@ -726,9 +738,10 @@ Db.prototype.executeDbAdminCommand = function(selector, options, callback) {
  * @param {string} name Name of the collection to create the index on.
  * @param {(string|object)} fieldOrSpec Defines the index.
  * @param {object} [options] Optional settings.
- * @param {(number|string)} [options.w] The write concern.
- * @param {number} [options.wtimeout] The write concern timeout.
- * @param {boolean} [options.j=false] Specify a journal write concern.
+ * @param {(number|string)} [options.w] **Deprecated** The write concern. Use writeConcern instead.
+ * @param {number} [options.wtimeout] **Deprecated** The write concern timeout. Use writeConcern instead.
+ * @param {boolean} [options.j=false] **Deprecated** Specify a journal write concern. Use writeConcern instead.
+ * @param {object|WriteConcern} [options.writeConcern] Specify write concern settings.
  * @param {boolean} [options.unique=false] Creates an unique index.
  * @param {boolean} [options.sparse=false] Creates a sparse index.
  * @param {boolean} [options.background=false] Creates the index in the background, yielding whenever possible.
@@ -760,9 +773,10 @@ Db.prototype.createIndex = function(name, fieldOrSpec, options, callback) {
  * @param {string} name The index name
  * @param {(string|object)} fieldOrSpec Defines the index.
  * @param {object} [options] Optional settings.
- * @param {(number|string)} [options.w] The write concern.
- * @param {number} [options.wtimeout] The write concern timeout.
- * @param {boolean} [options.j=false] Specify a journal write concern.
+ * @param {(number|string)} [options.w] **Deprecated** The write concern. Use writeConcern instead.
+ * @param {number} [options.wtimeout] **Deprecated** The write concern timeout. Use writeConcern instead.
+ * @param {boolean} [options.j=false] **Deprecated** Specify a journal write concern. Use writeConcern instead.
+ * @param {object|WriteConcern} [options.writeConcern] Specify write concern settings.
  * @param {boolean} [options.unique=false] Creates an unique index.
  * @param {boolean} [options.sparse=false] Creates a sparse index.
  * @param {boolean} [options.background=false] Creates the index in the background, yielding whenever possible.
@@ -800,9 +814,10 @@ Db.prototype.addChild = function(db) {
  * @param {string} username The username.
  * @param {string} password The password.
  * @param {object} [options] Optional settings.
- * @param {(number|string)} [options.w] The write concern.
- * @param {number} [options.wtimeout] The write concern timeout.
- * @param {boolean} [options.j=false] Specify a journal write concern.
+ * @param {(number|string)} [options.w] **Deprecated** The write concern. Use writeConcern instead.
+ * @param {number} [options.wtimeout] **Deprecated** The write concern timeout. Use writeConcern instead.
+ * @param {boolean} [options.j=false] **Deprecated** Specify a journal write concern. Use writeConcern instead.
+ * @param {object|WriteConcern} [options.writeConcern] Specify write concern settings.
  * @param {object} [options.customData] Custom data associated with the user (only Mongodb 2.6 or higher)
  * @param {object[]} [options.roles] Roles associated with the created user (only Mongodb 2.6 or higher)
  * @param {ClientSession} [options.session] optional session to use for this operation
@@ -829,9 +844,10 @@ Db.prototype.addUser = function(username, password, options, callback) {
  * @method
  * @param {string} username The username.
  * @param {object} [options] Optional settings.
- * @param {(number|string)} [options.w] The write concern.
- * @param {number} [options.wtimeout] The write concern timeout.
- * @param {boolean} [options.j=false] Specify a journal write concern.
+ * @param {(number|string)} [options.w] **Deprecated** The write concern. Use writeConcern instead.
+ * @param {number} [options.wtimeout] **Deprecated** The write concern timeout. Use writeConcern instead.
+ * @param {boolean} [options.j=false] **Deprecated** Specify a journal write concern. Use writeConcern instead.
+ * @param {object|WriteConcern} [options.writeConcern] Specify write concern settings.
  * @param {ClientSession} [options.session] optional session to use for this operation
  * @param {Db~resultCallback} [callback] The command result callback
  * @return {Promise} returns Promise if no callback passed

package/lib/explain.js

@@ -0,0 +1,55 @@
+'use strict';
+
+const MongoError = require('./core/error').MongoError;
+
+const ExplainVerbosity = {
+  queryPlanner: 'queryPlanner',
+  queryPlannerExtended: 'queryPlannerExtended',
+  executionStats: 'executionStats',
+  allPlansExecution: 'allPlansExecution'
+};
+
+/**
+ * @class
+ * @property {'queryPlanner'|'queryPlannerExtended'|'executionStats'|'allPlansExecution'} verbosity The verbosity mode for the explain output.
+ */
+class Explain {
+  /**
+   * Constructs an Explain from the explain verbosity.
+   *
+   * For backwards compatibility, true is interpreted as "allPlansExecution"
+   * and false as "queryPlanner". Prior to server version 3.6, aggregate()
+   * ignores the verbosity parameter and executes in "queryPlanner".
+   *
+   * @param {'queryPlanner'|'queryPlannerExtended'|'executionStats'|'allPlansExecution'|boolean} [verbosity] The verbosity mode for the explain output.
+   */
+  constructor(verbosity) {
+    if (typeof verbosity === 'boolean') {
+      this.verbosity = verbosity ? 'allPlansExecution' : 'queryPlanner';
+    } else {
+      this.verbosity = verbosity;
+    }
+  }
+
+  /**
+   * Construct an Explain given an options object.
+   *
+   * @param {object} [options] The options object from which to extract the explain.
+   * @param {'queryPlanner'|'queryPlannerExtended'|'executionStats'|'allPlansExecution'|boolean} [options.explain] The verbosity mode for the explain output
+   * @return {Explain}
+   */
+  static fromOptions(options) {
+    if (options == null || options.explain === undefined) {
+      return;
+    }
+
+    const explain = options.explain;
+    if (typeof explain === 'boolean' || explain in ExplainVerbosity) {
+      return new Explain(options.explain);
+    }
+
+    throw new MongoError(`explain must be one of ${Object.keys(ExplainVerbosity)} or a boolean`);
+  }
+}
+
+module.exports = { Explain };

package/lib/gridfs/grid_store.js

@@ -73,10 +73,11 @@ const deprecationFn = deprecate(() => {},
  * @param {string} [filename] optional filename for this file, no unique constrain on the field
  * @param {string} mode set the mode for this file.
  * @param {object} [options] Optional settings.
- * @param {(number|string)} [options.w] The write concern.
- * @param {number} [options.wtimeout] The write concern timeout.
- * @param {boolean} [options.j=false] Specify a journal write concern.
- * @param {boolean} [options.fsync=false] Specify a file sync write concern.
+ * @param {(number|string)} [options.w] **Deprecated** The write concern. Use writeConcern instead.
+ * @param {number} [options.wtimeout] **Deprecated** The write concern timeout. Use writeConcern instead.
+ * @param {boolean} [options.j=false] **Deprecated** Specify a journal write concern. Use writeConcern instead.
+ * @param {boolean} [options.fsync=false] **Deprecated** Specify a file sync write concern. Use writeConcern instead.
+ * @param {object|WriteConcern} [options.writeConcern] Specify write concern settings.
  * @param {string} [options.root] Root collection to use. Defaults to **{GridStore.DEFAULT_ROOT_COLLECTION}**.
  * @param {string} [options.content_type] MIME type of the file. Defaults to **{GridStore.DEFAULT_CONTENT_TYPE}**.
  * @param {number} [options.chunk_size=261120] Size for the chunk. Defaults to **{Chunk.DEFAULT_CHUNK_SIZE}**.
@@ -1572,12 +1573,13 @@ var _writeNormal = function(self, data, close, options, callback) {
  * @ignore
  */
 var _setWriteConcernHash = function(options) {
+  const baseOptions = Object.assign(options, options.writeConcern);
   var finalOptions = {};
-  if (options.w != null) finalOptions.w = options.w;
-  if (options.journal === true) finalOptions.j = options.journal;
-  if (options.j === true) finalOptions.j = options.j;
-  if (options.fsync === true) finalOptions.fsync = options.fsync;
-  if (options.wtimeout != null) finalOptions.wtimeout = options.wtimeout;
+  if (baseOptions.w != null) finalOptions.w = baseOptions.w;
+  if (baseOptions.journal === true) finalOptions.j = baseOptions.journal;
+  if (baseOptions.j === true) finalOptions.j = baseOptions.j;
+  if (baseOptions.fsync === true) finalOptions.fsync = baseOptions.fsync;
+  if (baseOptions.wtimeout != null) finalOptions.wtimeout = baseOptions.wtimeout;
   return finalOptions;
 };
 
@@ -1591,6 +1593,7 @@ var _getWriteConcern = function(self, options) {
 
   // Local options verification
   if (
+    options.writeConcern != null ||
     options.w != null ||
     typeof options.j === 'boolean' ||
     typeof options.journal === 'boolean' ||
@@ -1602,6 +1605,7 @@ var _getWriteConcern = function(self, options) {
   } else if (typeof options.safe === 'boolean') {
     finalOptions = { w: options.safe ? 1 : 0 };
   } else if (
+    self.options.writeConcern != null ||
     self.options.w != null ||
     typeof self.options.j === 'boolean' ||
     typeof self.options.journal === 'boolean' ||

package/lib/gridfs-stream/upload.js

@@ -22,9 +22,10 @@ module.exports = GridFSBucketWriteStream;
  * @param {object} [options] Optional settings.
  * @param {string|number|object} [options.id] Custom file id for the GridFS file.
  * @param {number} [options.chunkSizeBytes] The chunk size to use, in bytes
- * @param {number} [options.w] The write concern
- * @param {number} [options.wtimeout] The write concern timeout
- * @param {number} [options.j] The journal write concern
+ * @param {(number|string)} [options.w] **Deprecated** The write concern. Use writeConcern instead.
+ * @param {number} [options.wtimeout] **Deprecated** The write concern timeout. Use writeConcern instead.
+ * @param {boolean} [options.j=false] **Deprecated** Specify a journal write concern. Use writeConcern instead.
+ * @param {object|WriteConcern} [options.writeConcern] Specify write concern settings.
  * @param {boolean} [options.disableMD5=false] If true, disables adding an md5 field to file data
  * @fires GridFSBucketWriteStream#error
  * @fires GridFSBucketWriteStream#finish
@@ -32,6 +33,7 @@ module.exports = GridFSBucketWriteStream;
 
 function GridFSBucketWriteStream(bucket, filename, options) {
   options = options || {};
+  stream.Writable.call(this, options);
   this.bucket = bucket;
   this.chunks = bucket.s._chunksCollection;
   this.filename = filename;