mongodb 3.6.2 → 3.6.3

package/HISTORY.md

@@ -2,6 +2,30 @@
 
 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
 
+<a name="3.6.3"></a>
+## [3.6.3](https://github.com/mongodb/node-mongodb-native/compare/v3.6.1...v3.6.3) (2020-11-06)
+
+
+### Bug Fixes
+
+* add peerDependenciesMeta to mark optional deps ([#2606](https://github.com/mongodb/node-mongodb-native/issues/2606)) ([186090e](https://github.com/mongodb/node-mongodb-native/commit/186090e))
+* adds topology discovery for sharded cluster ([f8fd310](https://github.com/mongodb/node-mongodb-native/commit/f8fd310))
+* allow event loop to process during wait queue processing ([#2537](https://github.com/mongodb/node-mongodb-native/issues/2537)) ([4e03dfa](https://github.com/mongodb/node-mongodb-native/commit/4e03dfa))
+* Change socket timeout default to 0 ([#2572](https://github.com/mongodb/node-mongodb-native/issues/2572)) ([89b77ed](https://github.com/mongodb/node-mongodb-native/commit/89b77ed))
+* connection leak if wait queue member cancelled ([cafaa1b](https://github.com/mongodb/node-mongodb-native/commit/cafaa1b))
+* correctly assign username to X509 auth command ([#2587](https://github.com/mongodb/node-mongodb-native/issues/2587)) ([9110a45](https://github.com/mongodb/node-mongodb-native/commit/9110a45))
+* correctly re-establishes pipe destinations ([a6e7caf](https://github.com/mongodb/node-mongodb-native/commit/a6e7caf))
+* Fix test filters and revert mocha version ([#2558](https://github.com/mongodb/node-mongodb-native/issues/2558)) ([0e5c45a](https://github.com/mongodb/node-mongodb-native/commit/0e5c45a))
+* move kerberos client setup from prepare to auth ([#2608](https://github.com/mongodb/node-mongodb-native/issues/2608)) ([033b6e7](https://github.com/mongodb/node-mongodb-native/commit/033b6e7))
+* permit waking async interval with unreliable clock ([e0e11bb](https://github.com/mongodb/node-mongodb-native/commit/e0e11bb))
+* remove geoNear deprecation ([4955a52](https://github.com/mongodb/node-mongodb-native/commit/4955a52))
+* revert use of setImmediate to process.nextTick ([#2611](https://github.com/mongodb/node-mongodb-native/issues/2611)) ([c9f9d5e](https://github.com/mongodb/node-mongodb-native/commit/c9f9d5e))
+* sets primary read preference for writes ([ddcd03d](https://github.com/mongodb/node-mongodb-native/commit/ddcd03d))
+* use options for readPreference in client ([6acced0](https://github.com/mongodb/node-mongodb-native/commit/6acced0))
+* user roles take single string & DDL readPreference tests ([967de13](https://github.com/mongodb/node-mongodb-native/commit/967de13))
+
+
+
 <a name="3.6.2"></a>
 ## [3.6.2](https://github.com/mongodb/node-mongodb-native/compare/v3.6.1...v3.6.2) (2020-09-10)
 

package/lib/aggregation_cursor.js

@@ -3,7 +3,6 @@
 const MongoError = require('./core').MongoError;
 const Cursor = require('./cursor');
 const CursorState = require('./core/cursor').CursorState;
-const deprecate = require('util').deprecate;
 
 /**
  * @fileOverview The **AggregationCursor** class is an internal class that embodies an aggregation cursor on MongoDB
@@ -225,12 +224,6 @@ class AggregationCursor extends Cursor {
 // aliases
 AggregationCursor.prototype.get = AggregationCursor.prototype.toArray;
 
-// deprecated methods
-deprecate(
-  AggregationCursor.prototype.geoNear,
-  'The `$geoNear` stage is deprecated in MongoDB 4.0, and removed in version 4.2.'
-);
-
 /**
  * AggregationCursor stream data event, fired for each document in the cursor.
  *

package/lib/change_stream.js

@@ -437,7 +437,7 @@ function createChangeStreamCursor(self, options) {
 
   if (self.pipeDestinations) {
     const cursorStream = changeStreamCursor.stream(self.streamOptions);
-    for (let pipeDestination in self.pipeDestinations) {
+    for (let pipeDestination of self.pipeDestinations) {
       cursorStream.pipe(pipeDestination);
     }
   }

package/lib/cmap/connection.js

@@ -32,7 +32,7 @@ class Connection extends EventEmitter {
     this.id = options.id;
     this.address = streamIdentifier(stream);
     this.bson = options.bson;
-    this.socketTimeout = typeof options.socketTimeout === 'number' ? options.socketTimeout : 360000;
+    this.socketTimeout = typeof options.socketTimeout === 'number' ? options.socketTimeout : 0;
     this.host = options.host || 'localhost';
     this.port = options.port || 27017;
     this.monitorCommands =

package/lib/cmap/connection_pool.js

@@ -95,7 +95,7 @@ const VALID_POOL_OPTIONS = new Set([
 
 function resolveOptions(options, defaults) {
   const newOptions = Array.from(VALID_POOL_OPTIONS).reduce((obj, key) => {
-    if (options.hasOwnProperty(key)) {
+    if (Object.prototype.hasOwnProperty.call(options, key)) {
       obj[key] = options[key];
     }
 
@@ -233,7 +233,7 @@ class ConnectionPool extends EventEmitter {
     }
 
     this[kWaitQueue].push(waitQueueMember);
-    setImmediate(() => processWaitQueue(this));
+    process.nextTick(() => processWaitQueue(this));
   }
 
   /**
@@ -258,7 +258,7 @@ class ConnectionPool extends EventEmitter {
       destroyConnection(this, connection, reason);
     }
 
-    setImmediate(() => processWaitQueue(this));
+    process.nextTick(() => processWaitQueue(this));
   }
 
   /**
@@ -428,7 +428,7 @@ function createConnection(pool, callback) {
 
     // otherwise add it to the pool for later acquisition, and try to process the wait queue
     pool[kConnections].push(connection);
-    setImmediate(() => processWaitQueue(pool));
+    process.nextTick(() => processWaitQueue(pool));
   });
 }
 
@@ -439,7 +439,7 @@ function destroyConnection(pool, connection, reason) {
   pool[kPermits]++;
 
   // destroy the connection
-  setImmediate(() => connection.destroy());
+  process.nextTick(() => connection.destroy());
 }
 
 function processWaitQueue(pool) {
@@ -477,7 +477,7 @@ function processWaitQueue(pool) {
   if (pool.waitQueueSize && (maxPoolSize <= 0 || pool.totalConnectionCount < maxPoolSize)) {
     createConnection(pool, (err, connection) => {
       const waitQueueMember = pool[kWaitQueue].shift();
-      if (waitQueueMember == null) {
+      if (waitQueueMember == null || waitQueueMember[kCancelled]) {
         if (err == null) {
           pool[kConnections].push(connection);
         }
@@ -485,10 +485,6 @@ function processWaitQueue(pool) {
         return;
       }
 
-      if (waitQueueMember[kCancelled]) {
-        return;
-      }
-
       if (err) {
         pool.emit('connectionCheckOutFailed', new ConnectionCheckOutFailedEvent(pool, err));
       } else {

package/lib/core/auth/gssapi.js

@@ -5,88 +5,44 @@ const AuthProvider = require('./auth_provider').AuthProvider;
 const retrieveKerberos = require('../utils').retrieveKerberos;
 const MongoError = require('../error').MongoError;
 
-const kGssapiClient = Symbol('GSSAPI_CLIENT');
 let kerberos;
 
 class GSSAPI extends AuthProvider {
-  prepare(handshakeDoc, authContext, callback) {
-    const host = authContext.options.host;
-    const port = authContext.options.port;
-    const credentials = authContext.credentials;
-    if (!host || !port || !credentials) {
-      return callback(
-        new MongoError(
-          `Connection must specify: ${host ? 'host' : ''}, ${port ? 'port' : ''}, ${
-            credentials ? 'host' : 'credentials'
-          }.`
-        )
-      );
-    }
-    if (kerberos == null) {
-      try {
-        kerberos = retrieveKerberos();
-      } catch (e) {
-        return callback(e);
-      }
-    }
-    const username = credentials.username;
-    const password = credentials.password;
-    const mechanismProperties = credentials.mechanismProperties;
-    const serviceName =
-      mechanismProperties['gssapiservicename'] ||
-      mechanismProperties['gssapiServiceName'] ||
-      'mongodb';
-    performGssapiCanonicalizeHostName(host, mechanismProperties, (err, host) => {
-      if (err) return callback(err);
-      const initOptions = {};
-      if (password != null) {
-        Object.assign(initOptions, { user: username, password: password });
-      }
-      kerberos.initializeClient(
-        `${serviceName}${process.platform === 'win32' ? '/' : '@'}${host}`,
-        initOptions,
-        (err, client) => {
-          if (err) return callback(new MongoError(err));
-          if (client == null) return callback();
-          this[kGssapiClient] = client;
-          callback(undefined, handshakeDoc);
-        }
-      );
-    });
-  }
   auth(authContext, callback) {
     const connection = authContext.connection;
     const credentials = authContext.credentials;
     if (credentials == null) return callback(new MongoError('credentials required'));
     const username = credentials.username;
-    const client = this[kGssapiClient];
-    if (client == null) return callback(new MongoError('gssapi client missing'));
     function externalCommand(command, cb) {
       return connection.command('$external.$cmd', command, cb);
     }
-    client.step('', (err, payload) => {
+    makeKerberosClient(authContext, (err, client) => {
       if (err) return callback(err);
-      externalCommand(saslStart(payload), (err, response) => {
-        const result = response.result;
+      if (client == null) return callback(new MongoError('gssapi client missing'));
+      client.step('', (err, payload) => {
         if (err) return callback(err);
-        negotiate(client, 10, result.payload, (err, payload) => {
+        externalCommand(saslStart(payload), (err, response) => {
           if (err) return callback(err);
-          externalCommand(saslContinue(payload, result.conversationId), (err, response) => {
-            const result = response.result;
+          const result = response.result;
+          negotiate(client, 10, result.payload, (err, payload) => {
             if (err) return callback(err);
-            finalize(client, username, result.payload, (err, payload) => {
+            externalCommand(saslContinue(payload, result.conversationId), (err, response) => {
               if (err) return callback(err);
-              externalCommand(
-                {
-                  saslContinue: 1,
-                  conversationId: result.conversationId,
-                  payload
-                },
-                (err, result) => {
-                  if (err) return callback(err);
-                  callback(undefined, result);
-                }
-              );
+              const result = response.result;
+              finalize(client, username, result.payload, (err, payload) => {
+                if (err) return callback(err);
+                externalCommand(
+                  {
+                    saslContinue: 1,
+                    conversationId: result.conversationId,
+                    payload
+                  },
+                  (err, result) => {
+                    if (err) return callback(err);
+                    callback(undefined, result);
+                  }
+                );
+              });
             });
           });
         });
@@ -96,6 +52,50 @@ class GSSAPI extends AuthProvider {
 }
 module.exports = GSSAPI;
 
+function makeKerberosClient(authContext, callback) {
+  const host = authContext.options.host;
+  const port = authContext.options.port;
+  const credentials = authContext.credentials;
+  if (!host || !port || !credentials) {
+    return callback(
+      new MongoError(
+        `Connection must specify: ${host ? 'host' : ''}, ${port ? 'port' : ''}, ${
+          credentials ? 'host' : 'credentials'
+        }.`
+      )
+    );
+  }
+  if (kerberos == null) {
+    try {
+      kerberos = retrieveKerberos();
+    } catch (e) {
+      return callback(e);
+    }
+  }
+  const username = credentials.username;
+  const password = credentials.password;
+  const mechanismProperties = credentials.mechanismProperties;
+  const serviceName =
+    mechanismProperties['gssapiservicename'] ||
+    mechanismProperties['gssapiServiceName'] ||
+    'mongodb';
+  performGssapiCanonicalizeHostName(host, mechanismProperties, (err, host) => {
+    if (err) return callback(err);
+    const initOptions = {};
+    if (password != null) {
+      Object.assign(initOptions, { user: username, password: password });
+    }
+    kerberos.initializeClient(
+      `${serviceName}${process.platform === 'win32' ? '/' : '@'}${host}`,
+      initOptions,
+      (err, client) => {
+        if (err) return callback(new MongoError(err));
+        callback(null, client);
+      }
+    );
+  });
+}
+
 function saslStart(payload) {
   return {
     saslStart: 1,

package/lib/core/auth/x509.js

@@ -26,7 +26,7 @@ class X509 extends AuthProvider {
 function x509AuthenticateCommand(credentials) {
   const command = { authenticate: 1, mechanism: 'MONGODB-X509' };
   if (credentials.username) {
-    Object.apply(command, { user: credentials.username });
+    Object.assign(command, { user: credentials.username });
   }
 
   return command;

package/lib/core/connection/connect.js

@@ -263,7 +263,7 @@ function makeConnection(family, options, cancellationToken, _callback) {
       : typeof options.connectTimeoutMS === 'number'
       ? options.connectTimeoutMS
       : 30000;
-  const socketTimeout = typeof options.socketTimeout === 'number' ? options.socketTimeout : 360000;
+  const socketTimeout = typeof options.socketTimeout === 'number' ? options.socketTimeout : 0;
   const rejectUnauthorized =
     typeof options.rejectUnauthorized === 'boolean' ? options.rejectUnauthorized : true;
 

package/lib/core/connection/connection.js

@@ -69,7 +69,7 @@ class Connection extends EventEmitter {
    * @param {boolean} [options.keepAlive=true] TCP Connection keep alive enabled
    * @param {number} [options.keepAliveInitialDelay=120000] Initial delay before TCP keep alive enabled
    * @param {number} [options.connectionTimeout=30000] TCP Connection timeout setting
-   * @param {number} [options.socketTimeout=360000] TCP Socket timeout setting
+   * @param {number} [options.socketTimeout=0] TCP Socket timeout setting
    * @param {boolean} [options.promoteLongs] Convert Long values from the db into Numbers if they fit into 53 bits
    * @param {boolean} [options.promoteValues] Promotes BSON values to native types where possible, set to false to only receive wrapper types.
    * @param {boolean} [options.promoteBuffers] Promotes Binary BSON values to native Node Buffers.
@@ -92,7 +92,7 @@ class Connection extends EventEmitter {
 
     this.port = options.port || 27017;
     this.host = options.host || 'localhost';
-    this.socketTimeout = typeof options.socketTimeout === 'number' ? options.socketTimeout : 360000;
+    this.socketTimeout = typeof options.socketTimeout === 'number' ? options.socketTimeout : 0;
 
     // These values are inspected directly in tests, but maybe not necessary to keep around
     this.keepAlive = typeof options.keepAlive === 'boolean' ? options.keepAlive : true;
@@ -316,8 +316,7 @@ class Connection extends EventEmitter {
     if (typeof options === 'function') (callback = options), (options = {});
 
     const conn = this;
-    const socketTimeout =
-      typeof options.socketTimeout === 'number' ? options.socketTimeout : 360000;
+    const socketTimeout = typeof options.socketTimeout === 'number' ? options.socketTimeout : 0;
     const bson = conn.options.bson;
     const query = new Query(bson, ns, command, {
       numberToSkip: 0,

package/lib/core/connection/pool.js

@@ -63,8 +63,8 @@ var _id = 0;
  * @param {number} [options.keepAliveInitialDelay=120000] Initial delay before TCP keep alive enabled
  * @param {boolean} [options.noDelay=true] TCP Connection no delay
  * @param {number} [options.connectionTimeout=30000] TCP Connection timeout setting
- * @param {number} [options.socketTimeout=360000] TCP Socket timeout setting
- * @param {number} [options.monitoringSocketTimeout=30000] TCP Socket timeout setting for replicaset monitoring socket
+ * @param {number} [options.socketTimeout=0] TCP Socket timeout setting
+ * @param {number} [options.monitoringSocketTimeout=0] TCP Socket timeout setting for replicaset monitoring socket
  * @param {boolean} [options.ssl=false] Use SSL for connection
  * @param {boolean|function} [options.checkServerIdentity=true] Ensure we check server identify during SSL, set to false to disable checking. Only works for Node 0.12.x or higher. You can pass in a boolean or your own checkServerIdentity override function.
  * @param {Buffer} [options.ca] SSL Certificate store binary buffer
@@ -111,7 +111,7 @@ var Pool = function(topology, options) {
       minSize: 0,
       // socket settings
       connectionTimeout: 30000,
-      socketTimeout: 360000,
+      socketTimeout: 0,
       keepAlive: true,
       keepAliveInitialDelay: 120000,
       noDelay: true,

package/lib/core/sdam/topology_description.js

@@ -250,6 +250,7 @@ class TopologyDescription {
     if (descriptionsWithError.length > 0) {
       return descriptionsWithError[0].error;
     }
+    return undefined;
   }
 
   /**

package/lib/core/topologies/replset.js

@@ -919,7 +919,7 @@ ReplSet.prototype.connect = function(options) {
     );
   });
 
-  // Error out as high availbility interval must be < than socketTimeout
+  // Error out as high availability interval must be < than socketTimeout
   if (
     this.s.options.socketTimeout > 0 &&
     this.s.options.socketTimeout <= this.s.options.haInterval

package/lib/core/topologies/server.js

@@ -75,7 +75,7 @@ function topologyId(server) {
  * @param {number} [options.keepAliveInitialDelay=120000] Initial delay before TCP keep alive enabled
  * @param {boolean} [options.noDelay=true] TCP Connection no delay
  * @param {number} [options.connectionTimeout=30000] TCP Connection timeout setting
- * @param {number} [options.socketTimeout=360000] TCP Socket timeout setting
+ * @param {number} [options.socketTimeout=0] TCP Socket timeout setting
  * @param {boolean} [options.ssl=false] Use SSL for connection
  * @param {boolean|function} [options.checkServerIdentity=true] Ensure we check server identify during SSL, set to false to disable checking. Only works for Node 0.12.x or higher. You can pass in a boolean or your own checkServerIdentity override function.
  * @param {Buffer} [options.ca] SSL Certificate store binary buffer
@@ -389,7 +389,7 @@ var eventHandler = function(self, event) {
       event === 'timeout' ||
       event === 'reconnect' ||
       event === 'attemptReconnect' ||
-      'reconnectFailed'
+      event === 'reconnectFailed'
     ) {
       // Remove server instance from accounting
       if (

package/lib/core/uri_parser.js

@@ -687,15 +687,6 @@ 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/gridfs/grid_store.js

@@ -153,6 +153,7 @@ var GridStore = function GridStore(db, id, filename, mode, options) {
     },
     set: function(value) {
       if (!(this.mode[0] === 'w' && this.position === 0 && this.uploadDate == null)) {
+        // eslint-disable-next-line no-self-assign
         this.internalChunkSize = this.internalChunkSize;
       } else {
         this.internalChunkSize = value;

package/lib/mongo_client.js

@@ -97,7 +97,7 @@ const validOptions = require('./operations/connect').validOptions;
  * @param {boolean} [options.keepAlive=true] TCP Connection keep alive enabled
  * @param {number} [options.keepAliveInitialDelay=120000] The number of milliseconds to wait before initiating keepAlive on the TCP socket
  * @param {number} [options.connectTimeoutMS=10000] How long to wait for a connection to be established before timing out
- * @param {number} [options.socketTimeoutMS=360000] How long a send or receive on a socket can take before timing out
+ * @param {number} [options.socketTimeoutMS=0] How long a send or receive on a socket can take before timing out
  * @param {number} [options.family] Version of IP stack. Can be 4, 6 or null (default).
  * If null, will attempt to connect with IPv6, and will fall back to IPv4 on failure
  * @param {number} [options.reconnectTries=30] Server attempt to reconnect #times
@@ -169,6 +169,7 @@ function MongoClient(url, options) {
     dbCache: new Map(),
     sessions: new Set(),
     writeConcern: WriteConcern.fromOptions(options),
+    readPreference: ReadPreference.fromOptions(options) || ReadPreference.primary,
     namespace: new MongoDBNamespace('admin')
   };
 }
@@ -188,7 +189,7 @@ Object.defineProperty(MongoClient.prototype, 'writeConcern', {
 Object.defineProperty(MongoClient.prototype, 'readPreference', {
   enumerable: true,
   get: function() {
-    return ReadPreference.primary;
+    return this.s.readPreference;
   }
 });
 
@@ -371,7 +372,7 @@ MongoClient.prototype.isConnected = function(options) {
  * @param {boolean} [options.keepAlive=true] TCP Connection keep alive enabled
  * @param {number} [options.keepAliveInitialDelay=120000] The number of milliseconds to wait before initiating keepAlive on the TCP socket
  * @param {number} [options.connectTimeoutMS=10000] How long to wait for a connection to be established before timing out
- * @param {number} [options.socketTimeoutMS=360000] How long a send or receive on a socket can take before timing out
+ * @param {number} [options.socketTimeoutMS=0] How long a send or receive on a socket can take before timing out
  * @param {number} [options.family] Version of IP stack. Can be 4, 6 or null (default).
  * If null, will attempt to connect with IPv6, and will fall back to IPv4 on failure
  * @param {number} [options.reconnectTries=30] Server attempt to reconnect #times

package/lib/operations/add_user.js

@@ -22,7 +22,9 @@ class AddUserOperation extends CommandOperation {
     const options = this.options;
 
     // Get additional values
-    let roles = Array.isArray(options.roles) ? options.roles : [];
+    let roles = [];
+    if (Array.isArray(options.roles)) roles = options.roles;
+    if (typeof options.roles === 'string') roles = [options.roles];
 
     // If not roles defined print deprecated message
     // TODO: handle deprecation properly

package/lib/operations/admin_ops.js

@@ -39,7 +39,7 @@ function validateCollection(admin, collectionName, options, callback) {
 
   // Decorate command with extra options
   for (let i = 0; i < keys.length; i++) {
-    if (options.hasOwnProperty(keys[i]) && keys[i] !== 'session') {
+    if (Object.prototype.hasOwnProperty.call(options, keys[i]) && keys[i] !== 'session') {
       command[keys[i]] = options[keys[i]];
     }
   }

package/lib/operations/command_v2.js

@@ -17,7 +17,9 @@ class CommandOperationV2 extends OperationBase {
 
     this.ns = parent.s.namespace.withCollection('$cmd');
     const propertyProvider = this.hasAspect(Aspect.NO_INHERIT_OPTIONS) ? undefined : parent;
-    this.readPreference = ReadPreference.resolve(propertyProvider, this.options);
+    this.readPreference = this.hasAspect(Aspect.WRITE_OPERATION)
+      ? ReadPreference.primary
+      : ReadPreference.resolve(propertyProvider, this.options);
     this.readConcern = resolveReadConcern(propertyProvider, this.options);
     this.writeConcern = resolveWriteConcern(propertyProvider, this.options);
     this.explain = false;

package/lib/operations/connect.js

@@ -290,7 +290,7 @@ function connect(mongoClient, url, options, callback) {
     const _finalOptions = createUnifiedOptions(object, options);
 
     // Check if we have connection and socket timeout set
-    if (_finalOptions.socketTimeoutMS == null) _finalOptions.socketTimeoutMS = 360000;
+    if (_finalOptions.socketTimeoutMS == null) _finalOptions.socketTimeoutMS = 0;
     if (_finalOptions.connectTimeoutMS == null) _finalOptions.connectTimeoutMS = 10000;
     if (_finalOptions.retryWrites == null) _finalOptions.retryWrites = true;
     if (_finalOptions.useRecoveryToken == null) _finalOptions.useRecoveryToken = true;
@@ -788,7 +788,7 @@ function translateOptions(options, translationOptions) {
   }
 
   // Set the socket and connection timeouts
-  if (options.socketTimeoutMS == null) options.socketTimeoutMS = 360000;
+  if (options.socketTimeoutMS == null) options.socketTimeoutMS = 0;
   if (options.connectTimeoutMS == null) options.connectTimeoutMS = 10000;
 
   if (!translationOptions.createServers) {

package/lib/operations/validate_collection.js

@@ -8,7 +8,7 @@ class ValidateCollectionOperation extends CommandOperation {
     let command = { validate: collectionName };
     const keys = Object.keys(options);
     for (let i = 0; i < keys.length; i++) {
-      if (options.hasOwnProperty(keys[i]) && keys[i] !== 'session') {
+      if (Object.prototype.hasOwnProperty.call(options, keys[i]) && keys[i] !== 'session') {
         command[keys[i]] = options[keys[i]];
       }
     }

package/lib/topologies/mongos.js

@@ -84,7 +84,7 @@ var legalOptionNames = [
  * @param {boolean} [options.socketOptions.keepAlive=true] TCP Connection keep alive enabled
  * @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.socketOptions.socketTimeoutMS=0] 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.
  * @param {boolean} [options.monitorCommands=false] Enable command monitoring for this topology
  * @fires Mongos#connect

package/lib/topologies/server.js

@@ -86,7 +86,7 @@ var legalOptionNames = [
  * @param {boolean} [options.socketOptions.keepAlive=true] TCP Connection keep alive enabled
  * @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.socketOptions.socketTimeoutMS=0] How long a send or receive on a socket can take before timing out
  * @param {number} [options.reconnectTries=30] Server attempt to reconnect #times
  * @param {number} [options.reconnectInterval=1000] Server will wait # milliseconds between retries
  * @param {boolean} [options.monitoring=true] Triggers the server instance to call ismaster

package/lib/utils.js

@@ -565,7 +565,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 +716,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 +741,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 +770,7 @@ function makeInterruptableAsyncInterval(fn, options) {
 
   function executeAndReschedule() {
     lastWakeTime = 0;
-    lastCallTime = now();
+    lastCallTime = clock();
 
     fn(err => {
       if (err) throw err;
@@ -769,7 +781,7 @@ function makeInterruptableAsyncInterval(fn, options) {
   if (immediate) {
     executeAndReschedule();
   } else {
-    lastCallTime = now();
+    lastCallTime = clock();
     reschedule();
   }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mongodb",
-  "version": "3.6.2",
+  "version": "3.6.3",
   "description": "The official MongoDB driver for Node.js",
   "main": "index.js",
   "files": [
@@ -23,6 +23,26 @@
     "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.1",
     "bson": "^1.1.4",
@@ -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",
@@ -68,11 +90,11 @@
     "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/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",
+    "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"