mongodb 3.5.6 → 3.5.7

package/HISTORY.md

@@ -2,6 +2,17 @@
 
 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.5.7"></a>
+## [3.5.7](https://github.com/mongodb/node-mongodb-native/compare/v3.5.6...v3.5.7) (2020-04-29)
+
+
+### Bug Fixes
+
+* limit growth of server sessions through lazy acquisition ([3d05a6d](https://github.com/mongodb/node-mongodb-native/commit/3d05a6d))
+* remove circular dependency warnings on node 14 ([56a1b8a](https://github.com/mongodb/node-mongodb-native/commit/56a1b8a))
+
+
+
 <a name="3.5.6"></a>
 ## [3.5.6](https://github.com/mongodb/node-mongodb-native/compare/v3.5.5...v3.5.6) (2020-04-14)
 

package/lib/change_stream.js

@@ -6,6 +6,7 @@ const MongoError = require('./core').MongoError;
 const Cursor = require('./cursor');
 const relayEvents = require('./core/utils').relayEvents;
 const maxWireVersion = require('./core/utils').maxWireVersion;
+const maybePromise = require('./utils').maybePromise;
 const AggregateOperation = require('./operations/aggregate');
 
 const CHANGE_STREAM_OPTIONS = ['resumeAfter', 'startAfter', 'startAtOperationTime', 'fullDocument'];
@@ -124,10 +125,10 @@ class ChangeStream extends EventEmitter {
    * @function ChangeStream.prototype.hasNext
    * @param {ChangeStream~resultCallback} [callback] The result callback.
    * @throws {MongoError}
-   * @return {Promise} returns Promise if no callback passed
+   * @returns {Promise|void} returns Promise if no callback passed
    */
   hasNext(callback) {
-    return this.cursor.hasNext(callback);
+    return maybePromise(this.parent, callback, cb => this.cursor.hasNext(cb));
   }
 
   /**
@@ -135,19 +136,17 @@ class ChangeStream extends EventEmitter {
    * @function ChangeStream.prototype.next
    * @param {ChangeStream~resultCallback} [callback] The result callback.
    * @throws {MongoError}
-   * @return {Promise} returns Promise if no callback passed
+   * @returns {Promise|void} returns Promise if no callback passed
    */
   next(callback) {
-    var self = this;
-    if (this.isClosed()) {
-      if (callback) return callback(new Error('Change Stream is not open.'), null);
-      return self.promiseLibrary.reject(new Error('Change Stream is not open.'));
-    }
-
-    return this.cursor
-      .next()
-      .then(change => processNewChange({ changeStream: self, change, callback }))
-      .catch(error => processNewChange({ changeStream: self, error, callback }));
+    return maybePromise(this.parent, callback, cb => {
+      if (this.isClosed()) {
+        return cb(new Error('Change Stream is not open.'));
+      }
+      this.cursor.next((error, change) => {
+        processNewChange({ changeStream: this, error, change, callback: cb });
+      });
+    });
   }
 
   /**

package/lib/core/sessions.js

@@ -46,6 +46,8 @@ function assertAlive(session, callback) {
  * @typedef {Object} SessionId
  */
 
+const kServerSession = Symbol('serverSession');
+
 /**
  * A class representing a client session on the server
  * WARNING: not meant to be instantiated directly.
@@ -79,8 +81,8 @@ class ClientSession extends EventEmitter {
     this.topology = topology;
     this.sessionPool = sessionPool;
     this.hasEnded = false;
-    this.serverSession = sessionPool.acquire();
     this.clientOptions = clientOptions;
+    this[kServerSession] = undefined;
 
     this.supports = {
       causalConsistency:
@@ -104,6 +106,14 @@ class ClientSession extends EventEmitter {
     return this.serverSession.id;
   }
 
+  get serverSession() {
+    if (this[kServerSession] == null) {
+      this[kServerSession] = this.sessionPool.acquire();
+    }
+
+    return this[kServerSession];
+  }
+
   /**
    * Ends this session on the server
    *
@@ -125,7 +135,7 @@ class ClientSession extends EventEmitter {
 
     // release the server session back to the pool
     this.sessionPool.release(this.serverSession);
-    this.serverSession = null;
+    this[kServerSession] = undefined;
 
     // mark the session as ended, and emit a signal
     this.hasEnded = true;
@@ -692,13 +702,12 @@ function commandSupportsReadConcern(command, options) {
  * @return {MongoError|null} An error, if some error condition was met
  */
 function applySession(session, command, options) {
-  const serverSession = session.serverSession;
-  if (serverSession == null) {
+  if (session.hasEnded) {
     // TODO: merge this with `assertAlive`, did not want to throw a try/catch here
     return new MongoError('Cannot use a session that has ended');
   }
 
-  // mark the last use of this session, and apply the `lsid`
+  const serverSession = session.serverSession;
   serverSession.lastUse = Date.now();
   command.lsid = serverSession.id;
 

package/lib/mongo_client.js

@@ -143,6 +143,9 @@ const validOptions = require('./operations/connect').validOptions;
  * @param {number} [options.minSize] If present, the connection pool will be initialized with minSize connections, and will never dip below minSize connections
  * @param {boolean} [options.useNewUrlParser=true] Determines whether or not to use the new url parser. Enables the new, spec-compliant, url parser shipped in the core driver. This url parser fixes a number of problems with the original parser, and aims to outright replace that parser in the near future. Defaults to true, and must be explicitly set to false to use the legacy url parser.
  * @param {boolean} [options.useUnifiedTopology] Enables the new unified topology layer
+ * @param {Number} [options.localThresholdMS=15] **Only applies to the unified topology** The size of the latency window for selecting among multiple suitable servers
+ * @param {Number} [options.serverSelectionTimeoutMS=30000] **Only applies to the unified topology** How long to block for server selection before throwing an error
+ * @param {Number} [options.heartbeatFrequencyMS=10000] **Only applies to the unified topology** The frequency with which topology updates are scheduled
  * @param {AutoEncrypter~AutoEncryptionOptions} [options.autoEncryption] Optionally enable client side auto encryption
  * @param {DriverInfoOptions} [options.driverInfo] Allows a wrapping driver to amend the client metadata generated by the driver to include information about the wrapping driver
  * @param {MongoClient~connectCallback} [callback] The command result callback
@@ -344,7 +347,7 @@ MongoClient.prototype.isConnected = function(options) {
  * @param {object} [options] Optional settings
  * @param {number} [options.poolSize=5] The maximum size of the individual server pool
  * @param {boolean} [options.ssl=false] Enable SSL connection. *deprecated* use `tls` variants
- * @param {boolean} [options.sslValidate=false] Validate mongod server certificate against Certificate Authority *deprecated* use `tls` variants
+ * @param {boolean} [options.sslValidate=false] Validate mongod server certificate against Certificate Authority
  * @param {buffer} [options.sslCA=undefined] SSL Certificate store binary buffer *deprecated* use `tls` variants
  * @param {buffer} [options.sslCert=undefined] SSL Certificate binary buffer *deprecated* use `tls` variants
  * @param {buffer} [options.sslKey=undefined] SSL Key file binary buffer *deprecated* use `tls` variants
@@ -361,7 +364,7 @@ MongoClient.prototype.isConnected = function(options) {
  * @param {boolean} [options.autoReconnect=true] Enable autoReconnect for single server instances
  * @param {boolean} [options.noDelay=true] TCP Connection no delay
  * @param {boolean} [options.keepAlive=true] TCP Connection keep alive enabled
- * @param {boolean} [options.keepAliveInitialDelay=30000] The number of milliseconds to wait before initiating keepAlive on the TCP socket
+ * @param {number} [options.keepAliveInitialDelay=30000] 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.family] Version of IP stack. Can be 4, 6 or null (default).
@@ -405,7 +408,15 @@ MongoClient.prototype.isConnected = function(options) {
  * @param {array} [options.readPreferenceTags] Read preference tags
  * @param {number} [options.numberOfRetries=5] The number of retries for a tailable cursor
  * @param {boolean} [options.auto_reconnect=true] Enable auto reconnecting for single server instances
+ * @param {boolean} [options.monitorCommands=false] Enable command monitoring for this client
  * @param {number} [options.minSize] If present, the connection pool will be initialized with minSize connections, and will never dip below minSize connections
+ * @param {boolean} [options.useNewUrlParser=true] Determines whether or not to use the new url parser. Enables the new, spec-compliant, url parser shipped in the core driver. This url parser fixes a number of problems with the original parser, and aims to outright replace that parser in the near future. Defaults to true, and must be explicitly set to false to use the legacy url parser.
+ * @param {boolean} [options.useUnifiedTopology] Enables the new unified topology layer
+ * @param {Number} [options.localThresholdMS=15] **Only applies to the unified topology** The size of the latency window for selecting among multiple suitable servers
+ * @param {Number} [options.serverSelectionTimeoutMS=30000] **Only applies to the unified topology** How long to block for server selection before throwing an error
+ * @param {Number} [options.heartbeatFrequencyMS=10000] **Only applies to the unified topology** The frequency with which topology updates are scheduled
+ * @param {AutoEncrypter~AutoEncryptionOptions} [options.autoEncryption] Optionally enable client side auto encryption
+ * @param {DriverInfoOptions} [options.driverInfo] Allows a wrapping driver to amend the client metadata generated by the driver to include information about the wrapping driver
  * @param {MongoClient~connectCallback} [callback] The command result callback
  * @return {Promise<MongoClient>} returns Promise if no callback passed
  */

package/lib/operations/db_ops.js

@@ -3,7 +3,6 @@
 const applyWriteConcern = require('../utils').applyWriteConcern;
 const Code = require('../core').BSON.Code;
 const resolveReadPreference = require('../utils').resolveReadPreference;
-const crypto = require('crypto');
 const debugOptions = require('../utils').debugOptions;
 const handleCallback = require('../utils').handleCallback;
 const MongoError = require('../core').MongoError;
@@ -13,26 +12,6 @@ const toError = require('../utils').toError;
 const CONSTANTS = require('../constants');
 const MongoDBNamespace = require('../utils').MongoDBNamespace;
 
-const count = require('./collection_ops').count;
-const findOne = require('./collection_ops').findOne;
-const remove = require('./collection_ops').remove;
-const updateOne = require('./collection_ops').updateOne;
-
-let collection;
-function loadCollection() {
-  if (!collection) {
-    collection = require('../collection');
-  }
-  return collection;
-}
-let db;
-function loadDb() {
-  if (!db) {
-    db = require('../db');
-  }
-  return db;
-}
-
 const debugFields = [
   'authSource',
   'w',
@@ -55,113 +34,6 @@ const debugFields = [
   'noListener'
 ];
 
-/**
- * Add a user to the database.
- * @method
- * @param {Db} db The Db instance on which to add a user.
- * @param {string} username The username.
- * @param {string} password The password.
- * @param {object} [options] Optional settings. See Db.prototype.addUser for a list of options.
- * @param {Db~resultCallback} [callback] The command result callback
- */
-function addUser(db, username, password, options, callback) {
-  let Db = loadDb();
-
-  // Did the user destroy the topology
-  if (db.serverConfig && db.serverConfig.isDestroyed())
-    return callback(new MongoError('topology was destroyed'));
-  // Attempt to execute auth command
-  executeAuthCreateUserCommand(db, username, password, options, (err, r) => {
-    // We need to perform the backward compatible insert operation
-    if (err && err.code === -5000) {
-      const finalOptions = applyWriteConcern(Object.assign({}, options), { db }, options);
-
-      // Use node md5 generator
-      const md5 = crypto.createHash('md5');
-      // Generate keys used for authentication
-      md5.update(username + ':mongo:' + password);
-      const userPassword = md5.digest('hex');
-
-      // If we have another db set
-      const dbToUse = options.dbName ? new Db(options.dbName, db.s.topology, db.s.options) : db;
-
-      // Fetch a user collection
-      const collection = dbToUse.collection(CONSTANTS.SYSTEM_USER_COLLECTION);
-
-      // Check if we are inserting the first user
-      count(collection, {}, finalOptions, (err, count) => {
-        // We got an error (f.ex not authorized)
-        if (err != null) return handleCallback(callback, err, null);
-        // Check if the user exists and update i
-        const findOptions = Object.assign({ projection: { dbName: 1 } }, finalOptions);
-        collection.find({ user: username }, findOptions).toArray(err => {
-          // We got an error (f.ex not authorized)
-          if (err != null) return handleCallback(callback, err, null);
-          // Add command keys
-          finalOptions.upsert = true;
-
-          // We have a user, let's update the password or upsert if not
-          updateOne(
-            collection,
-            { user: username },
-            { $set: { user: username, pwd: userPassword } },
-            finalOptions,
-            err => {
-              if (count === 0 && err)
-                return handleCallback(callback, null, [{ user: username, pwd: userPassword }]);
-              if (err) return handleCallback(callback, err, null);
-              handleCallback(callback, null, [{ user: username, pwd: userPassword }]);
-            }
-          );
-        });
-      });
-
-      return;
-    }
-
-    if (err) return handleCallback(callback, err);
-    handleCallback(callback, err, r);
-  });
-}
-
-/**
- * Fetch all collections for the current db.
- *
- * @method
- * @param {Db} db The Db instance on which to fetch collections.
- * @param {object} [options] Optional settings. See Db.prototype.collections for a list of options.
- * @param {Db~collectionsResultCallback} [callback] The results callback
- */
-function collections(db, options, callback) {
-  let Collection = loadCollection();
-
-  options = Object.assign({}, options, { nameOnly: true });
-  // Let's get the collection names
-  db.listCollections({}, options).toArray((err, documents) => {
-    if (err != null) return handleCallback(callback, err, null);
-    // Filter collections removing any illegal ones
-    documents = documents.filter(doc => {
-      return doc.name.indexOf('$') === -1;
-    });
-
-    // Return the collection objects
-    handleCallback(
-      callback,
-      null,
-      documents.map(d => {
-        return new Collection(
-          db,
-          db.s.topology,
-          db.databaseName,
-          d.name,
-          db.s.pkFactory,
-          db.s.options
-        );
-      })
-    );
-  });
-}
-
 /**
  * Creates an index on the db and collection.
  * @method
@@ -248,50 +120,6 @@ function createListener(db, e, object) {
   return listener;
 }
 
-/**
- * Drop a collection from the database, removing it permanently. New accesses will create a new collection.
- *
- * @method
- * @param {Db} db The Db instance on which to drop the collection.
- * @param {string} name Name of collection to drop
- * @param {Object} [options] Optional settings. See Db.prototype.dropCollection for a list of options.
- * @param {Db~resultCallback} [callback] The results callback
- */
-function dropCollection(db, name, options, callback) {
-  executeCommand(db, name, options, (err, result) => {
-    // Did the user destroy the topology
-    if (db.serverConfig && db.serverConfig.isDestroyed()) {
-      return callback(new MongoError('topology was destroyed'));
-    }
-
-    if (err) return handleCallback(callback, err);
-    if (result.ok) return handleCallback(callback, null, true);
-    handleCallback(callback, null, false);
-  });
-}
-
-/**
- * Drop a database, removing it permanently from the server.
- *
- * @method
- * @param {Db} db The Db instance to drop.
- * @param {Object} cmd The command document.
- * @param {Object} [options] Optional settings. See Db.prototype.dropDatabase for a list of options.
- * @param {Db~resultCallback} [callback] The results callback
- */
-function dropDatabase(db, cmd, options, callback) {
-  executeCommand(db, cmd, options, (err, result) => {
-    // Did the user destroy the topology
-    if (db.serverConfig && db.serverConfig.isDestroyed()) {
-      return callback(new MongoError('topology was destroyed'));
-    }
-
-    if (callback == null) return;
-    if (err) return handleCallback(callback, err, null);
-    handleCallback(callback, null, result.ok ? true : false);
-  });
-}
-
 /**
  * Ensures that an index exists. If it does not, creates it.
  *
@@ -503,44 +331,6 @@ function profilingInfo(db, options, callback) {
   }
 }
 
-/**
- * Remove a user from a database
- *
- * @method
- * @param {Db} db The Db instance on which to remove the user.
- * @param {string} username The username.
- * @param {object} [options] Optional settings. See Db.prototype.removeUser for a list of options.
- * @param {Db~resultCallback} [callback] The command result callback
- */
-function removeUser(db, username, options, callback) {
-  let Db = loadDb();
-
-  // Attempt to execute command
-  executeAuthRemoveUserCommand(db, username, options, (err, result) => {
-    if (err && err.code === -5000) {
-      const finalOptions = applyWriteConcern(Object.assign({}, options), { db }, options);
-      // If we have another db set
-      const db = options.dbName ? new Db(options.dbName, db.s.topology, db.s.options) : db;
-
-      // Fetch a user collection
-      const collection = db.collection(CONSTANTS.SYSTEM_USER_COLLECTION);
-
-      // Locate the user
-      findOne(collection, { user: username }, finalOptions, (err, user) => {
-        if (user == null) return handleCallback(callback, err, false);
-        remove(collection, { user: username }, finalOptions, err => {
-          handleCallback(callback, err, true);
-        });
-      });
-
-      return;
-    }
-
-    if (err) return handleCallback(callback, err);
-    handleCallback(callback, err, result);
-  });
-}
-
 // Validate the database name
 function validateDatabaseName(databaseName) {
   if (typeof databaseName !== 'string')
@@ -665,165 +455,14 @@ function createIndexUsingCreateIndexes(db, name, fieldOrSpec, options, callback)
   });
 }
 
-/**
- * Run the createUser command.
- *
- * @param {Db} db The Db instance on which to execute the command.
- * @param {string} username The username of the user to add.
- * @param {string} password The password of the user to add.
- * @param {object} [options] Optional settings. See Db.prototype.addUser for a list of options.
- * @param {Db~resultCallback} [callback] The command result callback
- */
-function executeAuthCreateUserCommand(db, username, password, options, callback) {
-  // Special case where there is no password ($external users)
-  if (typeof username === 'string' && password != null && typeof password === 'object') {
-    options = password;
-    password = null;
-  }
-
-  // Unpack all options
-  if (typeof options === 'function') {
-    callback = options;
-    options = {};
-  }
-
-  // Error out if we digestPassword set
-  if (options.digestPassword != null) {
-    return callback(
-      toError(
-        "The digestPassword option is not supported via add_user. Please use db.command('createUser', ...) instead for this option."
-      )
-    );
-  }
-
-  // Get additional values
-  const customData = options.customData != null ? options.customData : {};
-  let roles = Array.isArray(options.roles) ? options.roles : [];
-  const maxTimeMS = typeof options.maxTimeMS === 'number' ? options.maxTimeMS : null;
-
-  // If not roles defined print deprecated message
-  if (roles.length === 0) {
-    console.log('Creating a user without roles is deprecated in MongoDB >= 2.6');
-  }
-
-  // Get the error options
-  const commandOptions = { writeCommand: true };
-  if (options['dbName']) commandOptions.dbName = options['dbName'];
-
-  // Add maxTimeMS to options if set
-  if (maxTimeMS != null) commandOptions.maxTimeMS = maxTimeMS;
-
-  // Check the db name and add roles if needed
-  if (
-    (db.databaseName.toLowerCase() === 'admin' || options.dbName === 'admin') &&
-    !Array.isArray(options.roles)
-  ) {
-    roles = ['root'];
-  } else if (!Array.isArray(options.roles)) {
-    roles = ['dbOwner'];
-  }
-
-  const digestPassword = db.s.topology.lastIsMaster().maxWireVersion >= 7;
-
-  // Build the command to execute
-  let command = {
-    createUser: username,
-    customData: customData,
-    roles: roles,
-    digestPassword
-  };
-
-  // Apply write concern to command
-  command = applyWriteConcern(command, { db }, options);
-
-  let userPassword = password;
-
-  if (!digestPassword) {
-    // Use node md5 generator
-    const md5 = crypto.createHash('md5');
-    // Generate keys used for authentication
-    md5.update(username + ':mongo:' + password);
-    userPassword = md5.digest('hex');
-  }
-
-  // No password
-  if (typeof password === 'string') {
-    command.pwd = userPassword;
-  }
-
-  // Force write using primary
-  commandOptions.readPreference = ReadPreference.primary;
-
-  // Execute the command
-  executeCommand(db, command, commandOptions, (err, result) => {
-    if (err && err.ok === 0 && err.code === undefined)
-      return handleCallback(callback, { code: -5000 }, null);
-    if (err) return handleCallback(callback, err, null);
-    handleCallback(
-      callback,
-      !result.ok ? toError(result) : null,
-      result.ok ? [{ user: username, pwd: '' }] : null
-    );
-  });
-}
-
-/**
- * Run the dropUser command.
- *
- * @param {Db} db The Db instance on which to execute the command.
- * @param {string} username The username of the user to remove.
- * @param {object} [options] Optional settings. See Db.prototype.removeUser for a list of options.
- * @param {Db~resultCallback} [callback] The command result callback
- */
-function executeAuthRemoveUserCommand(db, username, options, callback) {
-  if (typeof options === 'function') (callback = options), (options = {});
-  options = options || {};
-
-  // Did the user destroy the topology
-  if (db.serverConfig && db.serverConfig.isDestroyed())
-    return callback(new MongoError('topology was destroyed'));
-  // Get the error options
-  const commandOptions = { writeCommand: true };
-  if (options['dbName']) commandOptions.dbName = options['dbName'];
-
-  // Get additional values
-  const maxTimeMS = typeof options.maxTimeMS === 'number' ? options.maxTimeMS : null;
-
-  // Add maxTimeMS to options if set
-  if (maxTimeMS != null) commandOptions.maxTimeMS = maxTimeMS;
-
-  // Build the command to execute
-  let command = {
-    dropUser: username
-  };
-
-  // Apply write concern to command
-  command = applyWriteConcern(command, { db }, options);
-
-  // Force write using primary
-  commandOptions.readPreference = ReadPreference.primary;
-
-  // Execute the command
-  executeCommand(db, command, commandOptions, (err, result) => {
-    if (err && !err.ok && err.code === undefined) return handleCallback(callback, { code: -5000 });
-    if (err) return handleCallback(callback, err, null);
-    handleCallback(callback, null, result.ok ? true : false);
-  });
-}
-
 module.exports = {
-  addUser,
-  collections,
   createListener,
   createIndex,
-  dropCollection,
-  dropDatabase,
   ensureIndex,
   evaluate,
   executeCommand,
   executeDbAdminCommand,
   indexInformation,
   profilingInfo,
-  removeUser,
   validateDatabaseName
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mongodb",
-  "version": "3.5.6",
+  "version": "3.5.7",
   "description": "The official MongoDB driver for Node.js",
   "main": "index.js",
   "files": [
@@ -20,7 +20,7 @@
     "kerberos": "^1.1.0",
     "mongodb-client-encryption": "^1.0.0",
     "mongodb-extjson": "^2.1.2",
-    "snappy": "^6.1.1",
+    "snappy": "^6.3.4",
     "bson-ext": "^2.0.0"
   },
   "dependencies": {
@@ -49,7 +49,7 @@
     "semver": "^5.5.0",
     "sinon": "^4.3.0",
     "sinon-chai": "^3.2.0",
-    "snappy": "^6.1.2",
+    "snappy": "^6.3.4",
     "standard-version": "^4.4.0",
     "util.promisify": "^1.0.1",
     "worker-farm": "^1.5.0",