Merge branch '3.5' into 3.6

Author: mbroadst

HISTORY.md

@@ -2,6 +2,20 @@
 
 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.5"></a>
+## [3.5.5](https://github.com/mongodb/node-mongodb-native/compare/v3.5.4...v3.5.5) (2020-03-11)
+
+
+### Bug Fixes
+
+* correctly use template string for connection string error message ([6238c84](https://github.com/mongodb/node-mongodb-native/commit/6238c84))
+* don't depend on private node api for `Timeout` wrapper ([3ddaa3e](https://github.com/mongodb/node-mongodb-native/commit/3ddaa3e))
+* multiple concurrent attempts to process the queue may fail ([f69f51c](https://github.com/mongodb/node-mongodb-native/commit/f69f51c))
+* pass optional promise lib to maybePromise ([cde11ec](https://github.com/mongodb/node-mongodb-native/commit/cde11ec))
+* **cursor:** hasNext consumes documents on cursor with limit ([ef04d00](https://github.com/mongodb/node-mongodb-native/commit/ef04d00))
+
+
+
 <a name="3.5.4"></a>
 ## [3.5.4](https://github.com/mongodb/node-mongodb-native/compare/v3.5.3...v3.5.4) (2020-02-25)
 

README.md

@@ -33,7 +33,7 @@ Core Server (i.e. SERVER) project are **public**.
 
 ### Support / Feedback
 
-For issues with, questions about, or feedback for the Node.js driver, please look into our [support channels](http://www.mongodb.org/about/support). Please do not email any of the driver developers directly with issues or questions - you're more likely to get an answer on the [mongodb-user](http://groups.google.com/group/mongodb-user>) list on Google Groups.
+For issues with, questions about, or feedback for the Node.js driver, please look into our [support channels](https://docs.mongodb.com/manual/support). Please do not email any of the driver developers directly with issues or questions - you're more likely to get an answer on the [MongoDB Community Forums](https://community.mongodb.com/tags/c/drivers-odms-connectors/7/node-js-driver).
 
 ### Change Log
 

docs/guide/issues-help.txt

@@ -4,7 +4,7 @@ Issues & Help
 
 Our developer community is vibrant and highly engaged, with wide experience using Node.js with MongoDB.
 Often, the quickest way to get support for
-general questions is through the `mongodb-user google group <http://groups.google.com/group/mongodb-user>`_
+general questions is through the `MongoDB Community Forums <https://community.mongodb.com/tags/c/drivers-odms-connectors/7/node-js-driver>`_
 or through `stackoverflow <http://stackoverflow.com/questions/tagged/mongodb+nodejs>`_.
 
 Refer to our `support channels <http://www.mongodb.org/about/support>`_ documentation for more information.

docs/reference/content/issues-help.md

@@ -10,9 +10,9 @@ title = "Issues & Help"
 
 Our developer community is vibrant and highly engaged, with wide experience using Node.js with MongoDB.
 Often, the quickest way to get support for
-general questions is through the [mongodb-user google group](http://groups.google.com/group/mongodb-user)
+general questions is through the [MongoDB Community Forums](https://community.mongodb.com/tags/c/drivers-odms-connectors/7/node-js-driver)
 or through [stackoverflow](http://stackoverflow.com/questions/tagged/mongodb+nodejs).  
-Refer to our [support channels](http://www.mongodb.org/about/support) documentation for more information.
+Refer to our [support channels](https://docs.mongodb.com/manual/support) documentation for more information.
 
 ## Bugs / Feature Requests
 

lib/core/sdam/topology.js

@@ -385,6 +385,8 @@ class Topology extends EventEmitter {
         let readPreference;
         if (selector instanceof ReadPreference) {
           readPreference = selector;
+        } else if (typeof selector === 'string') {
+          readPreference = new ReadPreference(selector);
         } else {
           translateReadPreference(options);
           readPreference = options.readPreference || ReadPreference.primary;
@@ -526,10 +528,10 @@ class Topology extends EventEmitter {
     }
 
     // If we already know all the information contained in this updated description, then
-    // we don't need to update anything or emit SDAM events
-    if (previousServerDescription && previousServerDescription.equals(serverDescription)) {
-      return;
-    }
+    // we don't need to emit SDAM events, but still need to update the description, in order
+    // to keep client-tracked attributes like last update time and round trip time up to date
+    const equalDescriptions =
+      previousServerDescription && previousServerDescription.equals(serverDescription);
 
     // first update the TopologyDescription
     this.s.description = this.s.description.update(serverDescription);
@@ -539,15 +541,17 @@ class Topology extends EventEmitter {
     }
 
     // emit monitoring events for this change
-    this.emit(
-      'serverDescriptionChanged',
-      new events.ServerDescriptionChangedEvent(
-        this.s.id,
-        serverDescription.address,
-        previousServerDescription,
-        this.s.description.servers.get(serverDescription.address)
-      )
-    );
+    if (!equalDescriptions) {
+      this.emit(
+        'serverDescriptionChanged',
+        new events.ServerDescriptionChangedEvent(
+          this.s.id,
+          serverDescription.address,
+          previousServerDescription,
+          this.s.description.servers.get(serverDescription.address)
+        )
+      );
+    }
 
     // update server list from updated descriptions
     updateServers(this, serverDescription);
@@ -557,14 +561,16 @@ class Topology extends EventEmitter {
       processWaitQueue(this);
     }
 
-    this.emit(
-      'topologyDescriptionChanged',
-      new events.TopologyDescriptionChangedEvent(
-        this.s.id,
-        previousTopologyDescription,
-        this.s.description
-      )
-    );
+    if (!equalDescriptions) {
+      this.emit(
+        'topologyDescriptionChanged',
+        new events.TopologyDescriptionChangedEvent(
+          this.s.id,
+          previousTopologyDescription,
+          this.s.description
+        )
+      );
+    }
   }
 
   auth(credentials, callback) {
@@ -1004,10 +1010,9 @@ function processWaitQueue(topology) {
     return;
   }
 
-  const isSharded = topology.description.type === TopologyType.Sharded;
   const serverDescriptions = Array.from(topology.description.servers.values());
   const membersToProcess = topology[kWaitQueue].length;
-  for (let i = 0; i < membersToProcess; ++i) {
+  for (let i = 0; i < membersToProcess && topology[kWaitQueue].length; ++i) {
     const waitQueueMember = topology[kWaitQueue].shift();
     if (waitQueueMember[kCancelled]) {
       continue;
@@ -1033,6 +1038,7 @@ function processWaitQueue(topology) {
     const selectedServerDescription = randomSelection(selectedDescriptions);
     const selectedServer = topology.s.servers.get(selectedServerDescription.address);
     const transaction = waitQueueMember.transaction;
+    const isSharded = topology.description.type === TopologyType.Sharded;
     if (isSharded && transaction && transaction.isActive) {
       transaction.pinServer(selectedServer);
     }

lib/cursor.js

@@ -196,7 +196,7 @@ class Cursor extends CoreCursor {
       throw MongoError.create({ message: 'Cursor is closed', driver: true });
     }
 
-    return maybePromise(callback, cb => {
+    return maybePromise(this, callback, cb => {
       const cursor = this;
       if (cursor.isNotified()) {
         return cb(null, false);
@@ -209,7 +209,13 @@ class Cursor extends CoreCursor {
         }
 
         cursor.s.state = CursorState.OPEN;
+
+        // NODE-2482: merge this into the core cursor implementation
         cursor.cursorState.cursorIndex--;
+        if (cursor.cursorState.limit > 0) {
+          cursor.cursorState.currentLimit--;
+        }
+
         cb(null, true);
       });
     });
@@ -223,7 +229,7 @@ class Cursor extends CoreCursor {
    * @return {Promise} returns Promise if no callback passed
    */
   next(callback) {
-    return maybePromise(callback, cb => {
+    return maybePromise(this, callback, cb => {
       const cursor = this;
       if (cursor.s.state === CursorState.CLOSED || (cursor.isDead && cursor.isDead())) {
         cb(MongoError.create({ message: 'Cursor is closed', driver: true }));
@@ -812,8 +818,7 @@ class Cursor extends CoreCursor {
         driver: true
       });
     }
-
-    return maybePromise(callback, cb => {
+    return maybePromise(this, callback, cb => {
       const cursor = this;
       const items = [];
 
@@ -1040,8 +1045,7 @@ class Cursor extends CoreCursor {
     if (this.cmd.readConcern) {
       delete this.cmd['readConcern'];
     }
-
-    return maybePromise(callback, cb => {
+    return maybePromise(this, callback, cb => {
       CoreCursor.prototype._next.apply(this, [cb]);
     });
   }

lib/mongo_client.js

@@ -157,18 +157,12 @@ function MongoClient(url, options) {
   this.s = {
     url: url,
     options: options || {},
-    promiseLibrary: null,
+    promiseLibrary: (options && options.promiseLibrary) || Promise,
     dbCache: new Map(),
     sessions: new Set(),
     writeConcern: WriteConcern.fromOptions(options),
     namespace: new MongoDBNamespace('admin')
   };
-
-  // Get the promiseLibrary
-  const promiseLibrary = this.s.options.promiseLibrary || Promise;
-
-  // Add the promise to the internal state
-  this.s.promiseLibrary = promiseLibrary;
 }
 
 /**
@@ -214,7 +208,7 @@ MongoClient.prototype.connect = function(callback) {
   }
 
   const client = this;
-  return maybePromise(callback, cb => {
+  return maybePromise(this, callback, cb => {
     const err = validOptions(client.s.options);
     if (err) return cb(err);
 
@@ -244,7 +238,7 @@ MongoClient.prototype.close = function(force, callback) {
   }
 
   const client = this;
-  return maybePromise(callback, cb => {
+  return maybePromise(this, callback, cb => {
     const completeClose = err => {
       client.emit('close', client);
 

lib/utils.js

@@ -696,14 +696,19 @@ function* makeCounter(seed) {
 /**
  * Helper function for either accepting a callback, or returning a promise
  *
- * @param {Function} [callback] an optional callback.
+ * @param {Object} parent an instance of parent with promiseLibrary.
+ * @param {object} parent.s an object containing promiseLibrary.
+ * @param {function} parent.s.promiseLibrary an object containing promiseLibrary.
+ * @param {[Function]} callback an optional callback.
  * @param {Function} fn A function that takes a callback
  * @returns {Promise|void} Returns nothing if a callback is supplied, else returns a Promise.
  */
-function maybePromise(callback, fn) {
+function maybePromise(parent, callback, fn) {
+  const PromiseLibrary = (parent && parent.s && parent.s.promiseLibrary) || Promise;
+
   let result;
   if (typeof callback !== 'function') {
-    result = new Promise((resolve, reject) => {
+    result = new PromiseLibrary((resolve, reject) => {
       callback = (err, res) => {
         if (err) return reject(err);
         resolve(res);

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "mongodb",
-  "version": "3.5.4",
+  "version": "3.5.5",
   "description": "The official MongoDB driver for Node.js",
   "main": "index.js",
   "files": [
@@ -31,7 +31,6 @@
     "safe-buffer": "^5.1.2"
   },
   "devDependencies": {
-    "bluebird": "3.5.0",
     "chai": "^4.1.1",
     "chai-subset": "^1.6.0",
     "chalk": "^2.4.2",