mongodb 3.3.0-beta2 → 3.3.3

package/lib/operations/list_indexes.js

@@ -1,66 +1,42 @@
 'use strict';
 
-const OperationBase = require('./operation').OperationBase;
-const CommandCursor = require('../command_cursor');
-const MongoError = require('../core').MongoError;
-const resolveReadPreference = require('../utils').resolveReadPreference;
+const CommandOperationV2 = require('./command_v2');
+const Aspect = require('./operation').Aspect;
+const defineAspects = require('./operation').defineAspects;
+const maxWireVersion = require('../core/utils').maxWireVersion;
 
-class ListIndexesOperation extends OperationBase {
+const LIST_INDEXES_WIRE_VERSION = 3;
+
+class ListIndexesOperation extends CommandOperationV2 {
   constructor(collection, options) {
-    super(options);
+    super(collection, options, { fullResponse: true });
 
-    this.collection = collection;
+    this.collectionNamespace = collection.s.namespace;
   }
 
-  execute() {
-    const coll = this.collection;
-    let options = this.options;
-
-    options = options || {};
-    // Clone the options
-    options = Object.assign({}, options);
-    // Determine the read preference in the options.
-    options.readPreference = resolveReadPreference(coll, options);
-    // Set the CommandCursor constructor
-    options.cursorFactory = CommandCursor;
-    // Set the promiseLibrary
-    options.promiseLibrary = coll.s.promiseLibrary;
-
-    if (!coll.s.topology.capabilities()) {
-      throw new MongoError('cannot connect to server');
-    }
-
-    // Cursor options
-    let cursor = options.batchSize ? { batchSize: options.batchSize } : {};
+  execute(server, callback) {
+    const serverWireVersion = maxWireVersion(server);
+    if (serverWireVersion < LIST_INDEXES_WIRE_VERSION) {
+      const systemIndexesNS = this.collectionNamespace.withCollection('system.indexes').toString();
+      const collectionNS = this.collectionNamespace.toString();
 
-    // We have a list collections command
-    if (coll.s.topology.capabilities().hasListIndexesCommand) {
-      // Build the command
-      const command = { listIndexes: coll.collectionName, cursor: cursor };
-      // Execute the cursor
-      cursor = coll.s.topology.cursor(
-        coll.s.namespace.withCollection('$cmd').toString(),
-        command,
-        options
-      );
-      // Do we have a readPreference, apply it
-      if (options.readPreference) cursor.setReadPreference(options.readPreference);
-      // Return the cursor
-      return cursor;
+      server.query(systemIndexesNS, { query: { ns: collectionNS } }, {}, this.options, callback);
+      return;
     }
 
-    // Get the namespace
-    const namespace = coll.s.namespace.withCollection('system.indexes');
-    const ns = namespace.toString();
-    // Get the query
-    cursor = coll.s.topology.cursor(ns, { find: ns, query: { ns: coll.namespace } }, options);
-    // Do we have a readPreference, apply it
-    if (options.readPreference) cursor.setReadPreference(options.readPreference);
-    // Set the passed in batch size if one was provided
-    if (options.batchSize) cursor = cursor.batchSize(options.batchSize);
-    // Return the cursor
-    return cursor;
+    const cursor = this.options.batchSize ? { batchSize: this.options.batchSize } : {};
+    super.executeCommand(
+      server,
+      { listIndexes: this.collectionNamespace.collection, cursor },
+      callback
+    );
   }
 }
 
+defineAspects(ListIndexesOperation, [
+  Aspect.READ_OPERATION,
+  Aspect.RETRYABLE,
+  Aspect.EXECUTE_WITH_SELECTION
+]);
+
 module.exports = ListIndexesOperation;

package/lib/operations/operation.js

@@ -39,6 +39,10 @@ class OperationBase {
     delete this.options.session;
   }
 
+  get canRetryRead() {
+    return true;
+  }
+
   execute() {
     throw new TypeError('`execute` must be implemented for OperationBase subclasses');
   }

package/lib/operations/rename.js

@@ -45,7 +45,7 @@ class RenameOperation extends OperationBase {
           new Collection(
             coll.s.db,
             coll.s.topology,
-            coll.databaseName,
+            coll.s.namespace.db,
             newName,
             coll.s.pkFactory,
             coll.s.options

package/lib/operations/replace_one.js

@@ -40,7 +40,7 @@ function replaceCallback(err, r, doc, callback) {
     Array.isArray(r.result.upserted) && r.result.upserted.length ? r.result.upserted.length : 0;
   r.matchedCount =
     Array.isArray(r.result.upserted) && r.result.upserted.length > 0 ? 0 : r.result.n;
-  r.ops = [doc];
+  r.ops = [doc]; // TODO: Should we still have this?
   if (callback) callback(null, r);
 }
 

package/lib/operations/to_array.js

@@ -3,7 +3,7 @@
 const Aspect = require('./operation').Aspect;
 const defineAspects = require('./operation').defineAspects;
 const handleCallback = require('../utils').handleCallback;
-const loadCursor = require('../dynamic_loaders').loadCursor;
+const CursorState = require('../core/cursor').CursorState;
 const OperationBase = require('./operation').OperationBase;
 const push = Array.prototype.push;
 
@@ -16,14 +16,11 @@ class ToArrayOperation extends OperationBase {
 
   execute(callback) {
     const cursor = this.cursor;
-
-    let Cursor = loadCursor();
-
     const items = [];
 
     // Reset cursor
     cursor.rewind();
-    cursor.s.state = Cursor.INIT;
+    cursor.s.state = CursorState.INIT;
 
     // Fetch all the documents
     const fetchDocs = () => {
@@ -33,6 +30,7 @@ class ToArrayOperation extends OperationBase {
             ? cursor._endSession(() => handleCallback(callback, err))
             : handleCallback(callback, err);
         }
+
         if (doc == null) {
           return cursor.close({ skipKillCursors: true }, () =>
             handleCallback(callback, null, items)

package/lib/read_concern.js

@@ -29,10 +29,16 @@ class ReadConcern {
     }
 
     if (options.readConcern) {
+      if (options.readConcern instanceof ReadConcern) {
+        return options.readConcern;
+      }
+
       return new ReadConcern(options.readConcern.level);
     }
 
-    return new ReadConcern(options.level);
+    if (options.level) {
+      return new ReadConcern(options.level);
+    }
   }
 
   static get MAJORITY() {

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

@@ -89,7 +89,7 @@ var legalOptionNames = [
  * @param {number} [options.socketOptions.socketTimeoutMS=0] TCP Socket timeout setting
  * @param {number} [options.reconnectTries=30] Server attempt to reconnect #times
  * @param {number} [options.reconnectInterval=1000] Server will wait # milliseconds between retries
- * @param {number} [options.monitoring=true] Triggers the server instance to call ismaster
+ * @param {boolean} [options.monitoring=true] Triggers the server instance to call ismaster
  * @param {number} [options.haInterval=10000] The interval of calling ismaster when monitoring is enabled.
  * @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
@@ -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/lib/utils.js

@@ -1,7 +1,7 @@
 'use strict';
 
-const MongoError = require('./core').MongoError;
-const ReadPreference = require('./core').ReadPreference;
+const MongoError = require('./core/error').MongoError;
+const ReadPreference = require('./core/topologies/read_preference');
 const WriteConcern = require('./write_concern');
 
 var shallowClone = function(obj) {
@@ -519,7 +519,7 @@ function resolveReadPreference(parent, options) {
     throw new Error('No readPreference was provided or inherited.');
   }
 
-  return readPreference;
+  return typeof readPreference === 'string' ? new ReadPreference(readPreference) : readPreference;
 }
 
 /**
@@ -540,7 +540,7 @@ function isPromiseLike(maybePromise) {
  * @param {object} [options] options containing collation settings
  */
 function decorateWithCollation(command, target, options) {
-  const topology = target.s && target.s.topology;
+  const topology = (target.s && target.s.topology) || target.topology;
 
   if (!topology) {
     throw new TypeError('parameter "target" is missing a topology');

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mongodb",
-  "version": "3.3.0-beta2",
+  "version": "3.3.3",
   "description": "The official MongoDB driver for Node.js",
   "main": "index.js",
   "files": [
@@ -17,7 +17,7 @@
     "official"
   ],
   "peerOptionalDependencies": {
-    "kerberos": "^1.0.0",
+    "kerberos": "^1.1.0",
     "mongodb-client-encryption": "^1.0.0",
     "mongodb-extjson": "^2.1.2",
     "snappy": "^6.1.1",
@@ -32,6 +32,7 @@
     "bluebird": "3.5.0",
     "chai": "^4.1.1",
     "chai-subset": "^1.6.0",
+    "chalk": "^2.4.2",
     "co": "4.6.0",
     "coveralls": "^2.11.6",
     "eslint": "^4.5.0",
@@ -39,10 +40,10 @@
     "istanbul": "^0.4.5",
     "jsdoc": "3.5.5",
     "lodash.camelcase": "^4.3.0",
+    "mocha": "5.2.0",
     "mocha-sinon": "^2.1.0",
     "mongodb-extjson": "^2.1.1",
     "mongodb-mock-server": "^1.0.1",
-    "mongodb-test-runner": "^1.1.18",
     "prettier": "~1.12.0",
     "semver": "^5.5.0",
     "sinon": "^4.3.0",
@@ -61,7 +62,7 @@
   },
   "scripts": {
     "atlas": "node ./test/atlas_connectivity_tests.js",
-    "test": "npm run lint && mongodb-test-runner -t 60000 test/core test/unit test/functional",
+    "test": "npm run lint && mocha --recursive test/functional test/unit test/core",
     "coverage": "istanbul cover mongodb-test-runner -- -t 60000 test/core test/unit test/functional",
     "lint": "eslint lib test",
     "format": "prettier --print-width 100 --tab-width 2 --single-quote --write 'test/**/*.js' 'lib/**/*.js'",
@@ -69,5 +70,8 @@
     "generate-evergreen": "node .evergreen/generate_evergreen_tasks.js",
     "release": "standard-version -i HISTORY.md"
   },
-  "homepage": "https://github.com/mongodb/node-mongodb-native"
+  "homepage": "https://github.com/mongodb/node-mongodb-native",
+  "optionalDependencies": {
+    "saslprep": "^1.0.0"
+  }
 }

package/lib/operations/aggregate_operation.js

@@ -1,127 +0,0 @@
-'use strict';
-
-const OperationBase = require('./operation').OperationBase;
-const AggregationCursor = require('../aggregation_cursor');
-const applyWriteConcern = require('../utils').applyWriteConcern;
-const decorateWithCollation = require('../utils').decorateWithCollation;
-const decorateWithReadConcern = require('../utils').decorateWithReadConcern;
-const handleCallback = require('../utils').handleCallback;
-const MongoError = require('../core').MongoError;
-const resolveReadPreference = require('../utils').resolveReadPreference;
-const toError = require('../utils').toError;
-
-const DB_AGGREGATE_COLLECTION = 1;
-
-class AggregateOperation extends OperationBase {
-  constructor(db, collection, pipeline, options) {
-    super(options);
-
-    this.db = db;
-    this.collection = collection;
-    this.pipeline = pipeline;
-  }
-
-  execute(callback) {
-    const db = this.db;
-    const coll = this.collection;
-    let pipeline = this.pipeline;
-    let options = this.options;
-
-    const isDbAggregate = typeof coll === 'string';
-    const target = isDbAggregate ? db : coll;
-    const topology = target.s.topology;
-    let hasOutStage = false;
-
-    if (typeof options.out === 'string') {
-      pipeline = pipeline.concat({ $out: options.out });
-      hasOutStage = true;
-    } else if (pipeline.length > 0 && pipeline[pipeline.length - 1]['$out']) {
-      hasOutStage = true;
-    }
-
-    let command;
-    let namespace;
-    let optionSources;
-
-    if (isDbAggregate) {
-      command = { aggregate: DB_AGGREGATE_COLLECTION, pipeline: pipeline };
-      namespace = db.s.namespace.withCollection(DB_AGGREGATE_COLLECTION);
-
-      optionSources = { db };
-    } else {
-      command = { aggregate: coll.collectionName, pipeline: pipeline };
-      namespace = coll.s.namespace;
-
-      optionSources = { db: coll.s.db, collection: coll };
-    }
-
-    const takesWriteConcern = topology.capabilities().commandsTakeWriteConcern;
-
-    if (!hasOutStage) {
-      decorateWithReadConcern(command, target, options);
-    }
-
-    if (pipeline.length > 0 && pipeline[pipeline.length - 1]['$out'] && takesWriteConcern) {
-      applyWriteConcern(command, optionSources, options);
-    }
-
-    try {
-      decorateWithCollation(command, target, options);
-    } catch (err) {
-      if (typeof callback === 'function') return callback(err, null);
-      throw err;
-    }
-
-    if (options.bypassDocumentValidation === true) {
-      command.bypassDocumentValidation = options.bypassDocumentValidation;
-    }
-
-    if (typeof options.allowDiskUse === 'boolean') command.allowDiskUse = options.allowDiskUse;
-    if (typeof options.maxTimeMS === 'number') command.maxTimeMS = options.maxTimeMS;
-
-    if (options.hint) command.hint = options.hint;
-
-    options = Object.assign({}, options);
-
-    // Ensure we have the right read preference inheritance
-    options.readPreference = resolveReadPreference(options, optionSources);
-
-    if (options.explain) {
-      if (command.readConcern || command.writeConcern) {
-        throw toError(
-          '"explain" cannot be used on an aggregate call with readConcern/writeConcern'
-        );
-      }
-      command.explain = options.explain;
-    }
-
-    if (typeof options.comment === 'string') command.comment = options.comment;
-
-    // Validate that cursor options is valid
-    if (options.cursor != null && typeof options.cursor !== 'object') {
-      throw toError('cursor options must be an object');
-    }
-
-    options.cursor = options.cursor || {};
-    if (options.batchSize && !hasOutStage) options.cursor.batchSize = options.batchSize;
-    command.cursor = options.cursor;
-
-    // promiseLibrary
-    options.promiseLibrary = target.s.promiseLibrary;
-
-    // Set the AggregationCursor constructor
-    options.cursorFactory = AggregationCursor;
-
-    if (typeof callback !== 'function') {
-      if (!topology.capabilities()) {
-        throw new MongoError('cannot connect to server');
-      }
-
-      return topology.cursor(namespace.toString(), command, options);
-    }
-
-    return handleCallback(callback, null, topology.cursor(namespace.toString(), command, options));
-  }
-}
-
-module.exports = AggregateOperation;