mongodb 3.3.1 → 3.3.2

package/HISTORY.md

@@ -2,6 +2,18 @@
 
 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.3.2"></a>
+## [3.3.2](https://github.com/mongodb/node-mongodb-native/compare/v3.3.1...v3.3.2) (2019-08-28)
+
+
+### Bug Fixes
+
+* **change-stream:** default to server default batch size ([b3ae4c5](https://github.com/mongodb/node-mongodb-native/commit/b3ae4c5))
+* **execute-operation:** return promise on session support check ([a976c14](https://github.com/mongodb/node-mongodb-native/commit/a976c14))
+* **gridfs-stream:** ensure `close` is emitted after last chunk ([ae94cb9](https://github.com/mongodb/node-mongodb-native/commit/ae94cb9))
+
+
+
 <a name="3.3.1"></a>
 ## [3.3.1](https://github.com/mongodb/node-mongodb-native/compare/v3.3.0...v3.3.1) (2019-08-23)
 

package/lib/change_stream.js

@@ -367,10 +367,9 @@ function createChangeStreamCursor(self, options) {
 
   const pipeline = [{ $changeStream: changeStreamStageOptions }].concat(self.pipeline);
   const cursorOptions = applyKnownOptions({}, options, CURSOR_OPTIONS);
-  const changeStreamOptions = Object.assign({ batchSize: 1 }, options);
   const changeStreamCursor = new ChangeStreamCursor(
     self.topology,
-    new AggregateOperation(self.parent, pipeline, changeStreamOptions),
+    new AggregateOperation(self.parent, pipeline, options),
     cursorOptions
   );
 

package/lib/core/sdam/topology.js

@@ -139,7 +139,7 @@ class Topology extends EventEmitter {
       // Server Session Pool
       sessionPool: null,
       // Active client sessions
-      sessions: [],
+      sessions: new Set(),
       // Promise library
       promiseLibrary: options.promiseLibrary || Promise,
       credentials: options.credentials,
@@ -421,10 +421,10 @@ class Topology extends EventEmitter {
   startSession(options, clientOptions) {
     const session = new ClientSession(this, this.s.sessionPool, options, clientOptions);
     session.once('ended', () => {
-      this.s.sessions = this.s.sessions.filter(s => !s.equals(session));
+      this.s.sessions.delete(session);
     });
 
-    this.s.sessions.push(session);
+    this.s.sessions.add(session);
     return session;
   }
 

package/lib/gridfs-stream/download.js

@@ -185,12 +185,19 @@ function doRead(_this) {
     }
     if (!doc) {
       _this.push(null);
-      return _this.s.cursor.close(function(error) {
-        if (error) {
-          return __handleError(_this, error);
-        }
-        _this.emit('close');
+
+      process.nextTick(() => {
+        _this.s.cursor.close(function(error) {
+          if (error) {
+            __handleError(_this, error);
+            return;
+          }
+
+          _this.emit('close');
+        });
       });
+
+      return;
     }
 
     var bytesRemaining = _this.s.file.length - _this.s.bytesRead;

package/lib/mongo_client.js

@@ -157,7 +157,7 @@ function MongoClient(url, options) {
     options: options || {},
     promiseLibrary: null,
     dbCache: new Map(),
-    sessions: [],
+    sessions: new Set(),
     writeConcern: WriteConcern.fromOptions(options),
     namespace: new MongoDBNamespace('admin')
   };

package/lib/operations/connect.js

@@ -242,7 +242,7 @@ function collectEvents(mongoClient, topology) {
 }
 
 const emitDeprecationForNonUnifiedTopology = deprecate(() => {},
-'current Server Discovery and Monitoring engine is deprecated, and will be removed in a future version. ' + 'To use the new Server Discover and Monitoring engine, pass option { useUnifiedTopology: true } to MongoClient.connect.');
+'current Server Discovery and Monitoring engine is deprecated, and will be removed in a future version. ' + 'To use the new Server Discover and Monitoring engine, pass option { useUnifiedTopology: true } to the MongoClient constructor.');
 
 function connect(mongoClient, url, options, callback) {
   options = Object.assign({}, options);

package/lib/operations/execute_operation.js

@@ -35,18 +35,7 @@ function executeOperation(topology, operation, callback) {
     !operation.hasAspect(Aspect.SKIP_SESSION) &&
     topology.shouldCheckForSessionSupport()
   ) {
-    // TODO: this is only supported for unified topology, the first part of this check
-    //       should go away when we drop legacy topology types.
-    topology.selectServer(ReadPreference.primaryPreferred, err => {
-      if (err) {
-        callback(err);
-        return;
-      }
-
-      executeOperation(topology, operation, callback);
-    });
-
-    return;
+    return selectServerForSessionSupport(topology, operation, callback);
   }
 
   const Promise = topology.s.promiseLibrary;
@@ -179,4 +168,31 @@ function executeWithServerSelection(topology, operation, callback) {
   });
 }
 
+// TODO: This is only supported for unified topology, it should go away once
+//       we remove support for legacy topology types.
+function selectServerForSessionSupport(topology, operation, callback) {
+  const Promise = topology.s.promiseLibrary;
+
+  let result;
+  if (typeof callback !== 'function') {
+    result = new Promise((resolve, reject) => {
+      callback = (err, result) => {
+        if (err) return reject(err);
+        resolve(result);
+      };
+    });
+  }
+
+  topology.selectServer(ReadPreference.primaryPreferred, err => {
+    if (err) {
+      callback(err);
+      return;
+    }
+
+    executeOperation(topology, operation, callback);
+  });
+
+  return result;
+}
+
 module.exports = executeOperation;

package/lib/topologies/mongos.js

@@ -194,7 +194,7 @@ class Mongos extends TopologyBase {
       // Server Session Pool
       sessionPool: null,
       // Active client sessions
-      sessions: [],
+      sessions: new Set(),
       // Promise library
       promiseLibrary: options.promiseLibrary || Promise
     };

package/lib/topologies/replset.js

@@ -210,7 +210,7 @@ class ReplSet extends TopologyBase {
       // Server Session Pool
       sessionPool: null,
       // Active client sessions
-      sessions: [],
+      sessions: new Set(),
       // Promise library
       promiseLibrary: options.promiseLibrary || Promise
     };

package/lib/topologies/server.js

@@ -202,7 +202,7 @@ class Server extends TopologyBase {
       // Server Session Pool
       sessionPool: null,
       // Active client sessions
-      sessions: [],
+      sessions: new Set(),
       // Promise library
       promiseLibrary: promiseLibrary || Promise
     };

package/lib/topologies/topology_base.js

@@ -291,11 +291,12 @@ class TopologyBase extends EventEmitter {
 
   startSession(options, clientOptions) {
     const session = new ClientSession(this, this.s.sessionPool, options, clientOptions);
+
     session.once('ended', () => {
-      this.s.sessions = this.s.sessions.filter(s => !s.equals(session));
+      this.s.sessions.delete(session);
     });
 
-    this.s.sessions.push(session);
+    this.s.sessions.add(session);
     return session;
   }
 
@@ -382,9 +383,7 @@ class TopologyBase extends EventEmitter {
   close(forceClosed, callback) {
     // If we have sessions, we want to individually move them to the session pool,
     // and then send a single endSessions call.
-    if (this.s.sessions.length) {
-      this.s.sessions.forEach(session => session.endSession());
-    }
+    this.s.sessions.forEach(session => session.endSession());
 
     if (this.s.sessionPool) {
       this.s.sessionPool.endAllPooledSessions();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mongodb",
-  "version": "3.3.1",
+  "version": "3.3.2",
   "description": "The official MongoDB driver for Node.js",
   "main": "index.js",
   "files": [