mongodb 3.5.3 → 3.5.7

package/HISTORY.md

@@ -2,6 +2,66 @@
 
 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)
+
+
+### Bug Fixes
+
+* always return empty array for selection on unknown topology ([f9e786a](https://github.com/mongodb/node-mongodb-native/commit/f9e786a))
+* createCollection only uses listCollections in strict mode ([d368f12](https://github.com/mongodb/node-mongodb-native/commit/d368f12))
+* don't throw if `withTransaction()` callback rejects with a null reason ([153646c](https://github.com/mongodb/node-mongodb-native/commit/153646c))
+* only mark server session dirty if the client session is alive ([611be8d](https://github.com/mongodb/node-mongodb-native/commit/611be8d))
+* polyfill for util.promisify ([1c4cf6c](https://github.com/mongodb/node-mongodb-native/commit/1c4cf6c))
+* single `readPreferenceTags` should be parsed as an array ([a50611b](https://github.com/mongodb/node-mongodb-native/commit/a50611b))
+* **cursor:** transforms should only be applied once to documents ([704f30a](https://github.com/mongodb/node-mongodb-native/commit/704f30a))
+
+
+
+<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)
+
+
+### Bug Fixes
+
+* **cmap:** don't run min connection thread if no minimum specified ([2d1b713](https://github.com/mongodb/node-mongodb-native/commit/2d1b713))
+* **sdam:** use ObjectId comparison to track maxElectionId ([a1e0849](https://github.com/mongodb/node-mongodb-native/commit/a1e0849))
+* **topology:** ensure selection wait queue is always processed ([bf701d6](https://github.com/mongodb/node-mongodb-native/commit/bf701d6))
+* **topology:** enter `STATE_CLOSING` before draining waitQueue ([494dffb](https://github.com/mongodb/node-mongodb-native/commit/494dffb))
+* don't consume first document when calling `hasNext` on cursor ([bb359a1](https://github.com/mongodb/node-mongodb-native/commit/bb359a1))
+
+
+### Features
+
+* add utility helper for returning promises or using callbacks ([ac9e4c9](https://github.com/mongodb/node-mongodb-native/commit/ac9e4c9))
+
+
+
 <a name="3.5.3"></a>
 ## [3.5.3](https://github.com/mongodb/node-mongodb-native/compare/v3.5.2...v3.5.3) (2020-02-12)
 

package/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
 

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/cmap/connection_pool.js

@@ -362,7 +362,7 @@ class ConnectionPool extends EventEmitter {
 }
 
 function ensureMinPoolSize(pool) {
-  if (pool.closed) {
+  if (pool.closed || pool.options.minPoolSize === 0) {
     return;
   }
 

package/lib/collection.js

@@ -310,7 +310,7 @@ const DEPRECATED_FIND_OPTIONS = ['maxScan', 'fields', 'snapshot'];
  * @param {(ReadPreference|string)} [options.readPreference] The preferred read preference (ReadPreference.PRIMARY, ReadPreference.PRIMARY_PREFERRED, ReadPreference.SECONDARY, ReadPreference.SECONDARY_PREFERRED, ReadPreference.NEAREST).
  * @param {boolean} [options.partial=false] Specify if the cursor should return partial results when querying against a sharded system
  * @param {number} [options.maxTimeMS] Number of milliseconds to wait before aborting the query.
- * @param {number} [options.maxAwaitTimeMS] The maximum amount of time for the server to wait on new documents to satisfy a tailable cursor query. Requires `taiable` and `awaitData` to be true
+ * @param {number} [options.maxAwaitTimeMS] The maximum amount of time for the server to wait on new documents to satisfy a tailable cursor query. Requires `tailable` and `awaitData` to be true
  * @param {boolean} [options.noCursorTimeout] The server normally times out idle cursors after an inactivity period (10 minutes) to prevent excess memory use. Set this option to prevent that.
  * @param {object} [options.collation] Specify collation (MongoDB 3.4 or higher) settings for update operation (see 3.4 documentation for available fields).
  * @param {ClientSession} [options.session] optional session to use for this operation

package/lib/core/cursor.js

@@ -359,15 +359,6 @@ class CoreCursor extends Readable {
         return this.push(this.cursorState.streamOptions.transform(result));
       }
 
-      // If we provided a map function
-      if (
-        this.cursorState.transforms &&
-        typeof this.cursorState.transforms.doc === 'function' &&
-        result != null
-      ) {
-        return this.push(this.cursorState.transforms.doc(result));
-      }
-
       // Return the result
       this.push(result);
 

package/lib/core/sdam/server.js

@@ -463,11 +463,13 @@ function markServerUnknown(server, error) {
 }
 
 function makeOperationHandler(server, options, callback) {
+  const session = options && options.session;
+
   return function handleOperationResult(err, result) {
     if (err) {
       if (err instanceof MongoNetworkError) {
-        if (options && options.session) {
-          options.session.serverSession.isDirty = true;
+        if (session && !session.hasEnded) {
+          session.serverSession.isDirty = true;
         }
 
         if (!isNetworkTimeoutError(err)) {

package/lib/core/sdam/server_selection.js

@@ -186,6 +186,10 @@ function readPreferenceServerSelector(readPreference) {
       );
     }
 
+    if (topologyDescription.type === TopologyType.Unknown) {
+      return [];
+    }
+
     if (
       topologyDescription.type === TopologyType.Single ||
       topologyDescription.type === TopologyType.Sharded

package/lib/core/sdam/topology.js

@@ -312,7 +312,7 @@ class Topology extends EventEmitter {
     }
 
     options = options || {};
-    if (this.s.state === STATE_CLOSED) {
+    if (this.s.state === STATE_CLOSED || this.s.state === STATE_CLOSING) {
       if (typeof callback === 'function') {
         callback();
       }
@@ -320,6 +320,8 @@ class Topology extends EventEmitter {
       return;
     }
 
+    stateTransition(this, STATE_CLOSING);
+
     drainWaitQueue(this[kWaitQueue], new MongoError('Topology closed'));
     drainTimerQueue(this.s.connectionTimers);
 
@@ -336,8 +338,6 @@ class Topology extends EventEmitter {
       delete this.s.detectTopologyDescriptionChange;
     }
 
-    stateTransition(this, STATE_CLOSING);
-
     this.s.sessions.forEach(session => session.endSession());
     this.s.sessionPool.endAllPooledSessions(() => {
       eachAsync(
@@ -378,6 +378,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;
@@ -434,8 +436,7 @@ class Topology extends EventEmitter {
       }, serverSelectionTimeoutMS);
     }
 
-    // place the member at the front of the wait queue
-    this[kWaitQueue].unshift(waitQueueMember);
+    this[kWaitQueue].push(waitQueueMember);
     processWaitQueue(this);
   }
 
@@ -520,10 +521,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);
@@ -533,15 +534,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);
@@ -551,14 +554,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) {
@@ -980,7 +985,7 @@ function srvPollingHandler(topology) {
 
 function drainWaitQueue(queue, err) {
   while (queue.length) {
-    const waitQueueMember = queue.pop();
+    const waitQueueMember = queue.shift();
     clearTimeout(waitQueueMember.timer);
     if (!waitQueueMember[kCancelled]) {
       waitQueueMember.callback(err);
@@ -994,9 +999,9 @@ function processWaitQueue(topology) {
     return;
   }
 
-  const isSharded = topology.description.type === TopologyType.Sharded;
   const serverDescriptions = Array.from(topology.description.servers.values());
-  for (let i = 0; i < topology[kWaitQueue].length; ++i) {
+  const membersToProcess = topology[kWaitQueue].length;
+  for (let i = 0; i < membersToProcess && topology[kWaitQueue].length; ++i) {
     const waitQueueMember = topology[kWaitQueue].shift();
     if (waitQueueMember[kCancelled]) {
       continue;
@@ -1011,17 +1016,18 @@ function processWaitQueue(topology) {
     } catch (e) {
       clearTimeout(waitQueueMember.timer);
       waitQueueMember.callback(e);
-      break;
+      continue;
     }
 
     if (selectedDescriptions.length === 0) {
       topology[kWaitQueue].push(waitQueueMember);
-      break;
+      continue;
     }
 
     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);
     }

package/lib/core/sdam/topology_description.js

@@ -279,6 +279,26 @@ function topologyTypeForServerType(serverType) {
   return TopologyType.ReplicaSetNoPrimary;
 }
 
+function compareObjectId(oid1, oid2) {
+  if (oid1 == null) {
+    return -1;
+  }
+
+  if (oid2 == null) {
+    return 1;
+  }
+
+  if (oid1.id instanceof Buffer && oid2.id instanceof Buffer) {
+    const oid1Buffer = oid1.id;
+    const oid2Buffer = oid2.id;
+    return oid1Buffer.compare(oid2Buffer);
+  }
+
+  const oid1String = oid1.toString();
+  const oid2String = oid2.toString();
+  return oid1String.localeCompare(oid2String);
+}
+
 function updateRsFromPrimary(
   serverDescriptions,
   setName,
@@ -292,11 +312,13 @@ function updateRsFromPrimary(
     return [checkHasPrimary(serverDescriptions), setName, maxSetVersion, maxElectionId];
   }
 
-  const electionIdOID = serverDescription.electionId ? serverDescription.electionId.$oid : null;
-  const maxElectionIdOID = maxElectionId ? maxElectionId.$oid : null;
-  if (serverDescription.setVersion != null && electionIdOID != null) {
-    if (maxSetVersion != null && maxElectionIdOID != null) {
-      if (maxSetVersion > serverDescription.setVersion || maxElectionIdOID > electionIdOID) {
+  const electionId = serverDescription.electionId ? serverDescription.electionId : null;
+  if (serverDescription.setVersion && electionId) {
+    if (maxSetVersion && maxElectionId) {
+      if (
+        maxSetVersion > serverDescription.setVersion ||
+        compareObjectId(maxElectionId, electionId) > 0
+      ) {
         // this primary is stale, we must remove it
         serverDescriptions.set(
           serverDescription.address,

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
    *
@@ -123,14 +133,14 @@ class ClientSession extends EventEmitter {
       this.abortTransaction(); // pass in callback?
     }
 
+    // release the server session back to the pool
+    this.sessionPool.release(this.serverSession);
+    this[kServerSession] = undefined;
+
     // mark the session as ended, and emit a signal
     this.hasEnded = true;
     this.emit('ended', this);
 
-    // release the server session back to the pool
-    this.sessionPool.release(this.serverSession);
-    this.serverSession = null;
-
     // spec indicates that we should ignore all errors for `endSessions`
     if (typeof callback === 'function') callback(null, null);
   }
@@ -304,6 +314,7 @@ function isUnknownTransactionCommitResult(err) {
 }
 
 function isMaxTimeMSExpiredError(err) {
+  if (err == null) return false;
   return (
     err.code === MAX_TIME_MS_EXPIRED_CODE ||
     (err.writeConcernError && err.writeConcernError.code === MAX_TIME_MS_EXPIRED_CODE)
@@ -691,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/core/topologies/shared.js

@@ -211,10 +211,18 @@ function Interval(fn, time) {
 
 function Timeout(fn, time) {
   var timer = false;
+  var func = () => {
+    if (timer) {
+      clearTimeout(timer);
+      timer = false;
+
+      fn();
+    }
+  };
 
   this.start = function() {
     if (!this.isRunning()) {
-      timer = setTimeout(fn, time);
+      timer = setTimeout(func, time);
     }
     return this;
   };
@@ -226,7 +234,6 @@ function Timeout(fn, time) {
   };
 
   this.isRunning = function() {
-    if (timer && timer._called) return false;
     return timer !== false;
   };
 }

package/lib/core/uri_parser.js

@@ -285,8 +285,8 @@ function applyConnectionStringOption(obj, key, value, options) {
     }
   }
 
-  if (key === 'readpreferencetags' && Array.isArray(value)) {
-    value = splitArrayOfMultipleReadPreferenceTags(value);
+  if (key === 'readpreferencetags') {
+    value = Array.isArray(value) ? splitArrayOfMultipleReadPreferenceTags(value) : [value];
   }
 
   // set the actual value
@@ -510,7 +510,7 @@ function assertTlsOptionsAreEqual(optionName, queryString, queryStringKeys) {
       const firstValue = queryString[optionName][0];
       queryString[optionName].forEach(tlsValue => {
         if (tlsValue !== firstValue) {
-          throw new MongoParseError('All values of ${optionName} must be the same.');
+          throw new MongoParseError(`All values of ${optionName} must be the same.`);
         }
       });
     }

package/lib/core/utils.js

@@ -255,6 +255,8 @@ function makeClientMetadata(options) {
   return metadata;
 }
 
+const noop = () => {};
+
 module.exports = {
   uuidV4,
   calculateDurationInMs,
@@ -270,5 +272,6 @@ module.exports = {
   tagsStrictEqual,
   errorStrictEqual,
   makeStateMachine,
-  makeClientMetadata
+  makeClientMetadata,
+  noop
 };