mongodb 3.2.5 → 3.3.0-beta2

package/lib/db.js

@@ -7,41 +7,47 @@ const CommandCursor = require('./command_cursor');
 const handleCallback = require('./utils').handleCallback;
 const filterOptions = require('./utils').filterOptions;
 const toError = require('./utils').toError;
-const ReadPreference = require('mongodb-core').ReadPreference;
-const MongoError = require('mongodb-core').MongoError;
-const ObjectID = require('mongodb-core').ObjectID;
-const Logger = require('mongodb-core').Logger;
+const ReadPreference = require('./core').ReadPreference;
+const MongoError = require('./core').MongoError;
+const ObjectID = require('./core').ObjectID;
+const Logger = require('./core').Logger;
 const Collection = require('./collection');
 const mergeOptionsAndWriteConcern = require('./utils').mergeOptionsAndWriteConcern;
-const executeOperation = require('./utils').executeOperation;
-const applyWriteConcern = require('./utils').applyWriteConcern;
+const executeLegacyOperation = require('./utils').executeLegacyOperation;
 const resolveReadPreference = require('./utils').resolveReadPreference;
 const ChangeStream = require('./change_stream');
 const deprecate = require('util').deprecate;
 const deprecateOptions = require('./utils').deprecateOptions;
+const MongoDBNamespace = require('./utils').MongoDBNamespace;
 const CONSTANTS = require('./constants');
+const WriteConcern = require('./write_concern');
+const ReadConcern = require('./read_concern');
 
 // Operations
-const addUser = require('./operations/db_ops').addUser;
 const aggregate = require('./operations/aggregate').aggregate;
-const collections = require('./operations/db_ops').collections;
-const createCollection = require('./operations/db_ops').createCollection;
-const createIndex = require('./operations/db_ops').createIndex;
 const createListener = require('./operations/db_ops').createListener;
-const dropCollection = require('./operations/db_ops').dropCollection;
-const dropDatabase = require('./operations/db_ops').dropDatabase;
 const ensureIndex = require('./operations/db_ops').ensureIndex;
 const evaluate = require('./operations/db_ops').evaluate;
-const executeCommand = require('./operations/db_ops').executeCommand;
-const executeDbAdminCommand = require('./operations/db_ops').executeDbAdminCommand;
-const indexInformation = require('./operations/db_ops').indexInformation;
 const listCollectionsTransforms = require('./operations/db_ops').listCollectionsTransforms;
 const profilingInfo = require('./operations/db_ops').profilingInfo;
-const profilingLevel = require('./operations/db_ops').profilingLevel;
-const removeUser = require('./operations/db_ops').removeUser;
-const setProfilingLevel = require('./operations/db_ops').setProfilingLevel;
 const validateDatabaseName = require('./operations/db_ops').validateDatabaseName;
 
+const AddUserOperation = require('./operations/add_user');
+const CollectionsOperation = require('./operations/collections');
+const CommandOperation = require('./operations/command');
+const CreateCollectionOperation = require('./operations/create_collection');
+const CreateIndexOperation = require('./operations/create_index');
+const DropCollectionOperation = require('./operations/drop').DropCollectionOperation;
+const DropDatabaseOperation = require('./operations/drop').DropDatabaseOperation;
+const ExecuteDbAdminCommandOperation = require('./operations/execute_db_admin_command');
+const IndexInformationOperation = require('./operations/index_information');
+const ProfilingLevelOperation = require('./operations/profiling_level');
+const RemoveUserOperation = require('./operations/remove_user');
+const RenameOperation = require('./operations/rename');
+const SetProfilingLevelOperation = require('./operations/set_profiling_level');
+
+const executeOperation = require('./operations/execute_operation');
+
 /**
  * @fileOverview The **Db** class is a class that represents a MongoDB Database.
  *
@@ -146,8 +152,6 @@ function Db(databaseName, topology, options) {
 
   // Internal state of the db object
   this.s = {
-    // Database name
-    databaseName: databaseName,
     // DbCache
     dbCache: {},
     // Children db's
@@ -161,7 +165,7 @@ function Db(databaseName, topology, options) {
     // Get the bson parser
     bson: topology ? topology.bson : null,
     // Unpack read preference
-    readPreference: options.readPreference,
+    readPreference: ReadPreference.fromOptions(options),
     // Set buffermaxEntries
     bufferMaxEntries: typeof options.bufferMaxEntries === 'number' ? options.bufferMaxEntries : -1,
     // Parent db (if chained)
@@ -175,16 +179,19 @@ function Db(databaseName, topology, options) {
     // No listener
     noListener: typeof options.noListener === 'boolean' ? options.noListener : false,
     // ReadConcern
-    readConcern: options.readConcern
+    readConcern: ReadConcern.fromOptions(options),
+    writeConcern: WriteConcern.fromOptions(options),
+    // Namespace
+    namespace: new MongoDBNamespace(databaseName)
   };
 
   // Ensure we have a valid db name
-  validateDatabaseName(this.s.databaseName);
+  validateDatabaseName(databaseName);
 
   // Add a read Only property
   getSingleProperty(this, 'serverConfig', this.s.topology);
   getSingleProperty(this, 'bufferMaxEntries', this.s.bufferMaxEntries);
-  getSingleProperty(this, 'databaseName', this.s.databaseName);
+  getSingleProperty(this, 'databaseName', this.s.namespace.db);
 
   // This is a child db, do not register any listeners
   if (options.parentDb) return;
@@ -234,16 +241,37 @@ Object.defineProperty(Db.prototype, 'slaveOk', {
   }
 });
 
+Object.defineProperty(Db.prototype, 'readConcern', {
+  enumerable: true,
+  get: function() {
+    return this.s.readConcern;
+  }
+});
+
+Object.defineProperty(Db.prototype, 'readPreference', {
+  enumerable: true,
+  get: function() {
+    if (this.s.readPreference == null) {
+      // TODO: check client
+      return ReadPreference.primary;
+    }
+
+    return this.s.readPreference;
+  }
+});
+
 // get the write Concern
 Object.defineProperty(Db.prototype, 'writeConcern', {
   enumerable: true,
   get: function() {
-    const ops = {};
-    if (this.s.options.w != null) ops.w = this.s.options.w;
-    if (this.s.options.j != null) ops.j = this.s.options.j;
-    if (this.s.options.fsync != null) ops.fsync = this.s.options.fsync;
-    if (this.s.options.wtimeout != null) ops.wtimeout = this.s.options.wtimeout;
-    return ops;
+    return this.s.writeConcern;
+  }
+});
+
+Object.defineProperty(Db.prototype, 'namespace', {
+  enumerable: true,
+  get: function() {
+    return this.s.namespace.toString();
   }
 });
 
@@ -261,7 +289,9 @@ Db.prototype.command = function(command, options, callback) {
   if (typeof options === 'function') (callback = options), (options = {});
   options = Object.assign({}, options);
 
-  return executeOperation(this.s.topology, executeCommand, [this, command, options, callback]);
+  const commandOperation = new CommandOperation(this, options, null, command);
+
+  return executeOperation(this.s.topology, commandOperation, callback);
 };
 
 /**
@@ -368,7 +398,9 @@ Db.prototype.collection = function(name, options, callback) {
   options.promiseLibrary = this.s.promiseLibrary;
 
   // If we have not set a collection level readConcern set the db level one
-  options.readConcern = options.readConcern || this.s.readConcern;
+  options.readConcern = options.readConcern
+    ? new ReadConcern(options.readConcern.level)
+    : this.readConcern;
 
   // Do we have ignoreUndefined set
   if (this.s.options.ignoreUndefined) {
@@ -384,7 +416,7 @@ Db.prototype.collection = function(name, options, callback) {
       const collection = new Collection(
         this,
         this.s.topology,
-        this.s.databaseName,
+        this.databaseName,
         name,
         this.s.pkFactory,
         options
@@ -423,7 +455,7 @@ Db.prototype.collection = function(name, options, callback) {
       return handleCallback(
         callback,
         null,
-        new Collection(this, this.s.topology, this.s.databaseName, name, this.s.pkFactory, options)
+        new Collection(this, this.s.topology, this.databaseName, name, this.s.pkFactory, options)
       );
     } catch (err) {
       return handleCallback(callback, err, null);
@@ -473,8 +505,12 @@ Db.prototype.createCollection = deprecateOptions(
     if (typeof options === 'function') (callback = options), (options = {});
     options = options || {};
     options.promiseLibrary = options.promiseLibrary || this.s.promiseLibrary;
+    options.readConcern = options.readConcern
+      ? new ReadConcern(options.readConcern.level)
+      : this.readConcern;
+    const createCollectionOperation = new CreateCollectionOperation(this, name, options);
 
-    return executeOperation(this.s.topology, createCollection, [this, name, options, callback]);
+    return executeOperation(this.s.topology, createCollectionOperation, callback);
   }
 );
 
@@ -501,8 +537,10 @@ Db.prototype.stats = function(options, callback) {
     options.readPreference = this.s.readPreference;
   }
 
+  const statsOperation = new CommandOperation(this, options, null, commandObject);
+
   // Execute the command
-  return this.command(commandObject, options, callback);
+  return executeOperation(this.s.topology, statsOperation, callback);
 };
 
 /**
@@ -527,10 +565,7 @@ Db.prototype.listCollections = function(filter, options) {
   options.promiseLibrary = this.s.promiseLibrary;
 
   // Ensure valid readPreference
-  options.readPreference = resolveReadPreference(options, {
-    db: this,
-    default: ReadPreference.primary
-  });
+  options.readPreference = resolveReadPreference(this, options);
 
   // Cursor options
   let cursor = options.batchSize ? { batchSize: options.batchSize } : {};
@@ -543,7 +578,11 @@ Db.prototype.listCollections = function(filter, options) {
     // Set the AggregationCursor constructor
     options.cursorFactory = CommandCursor;
     // Create the cursor
-    cursor = this.s.topology.cursor(`${this.s.databaseName}.$cmd`, command, options);
+    cursor = this.s.topology.cursor(
+      this.s.namespace.withCollection('$cmd').toString(),
+      command,
+      options
+    );
     // Do we have a readPreference, apply it
     if (options.readPreference) {
       cursor.setReadPreference(options.readPreference);
@@ -560,13 +599,13 @@ Db.prototype.listCollections = function(filter, options) {
       !new RegExp('^' + this.databaseName + '\\.').test(filter.name)
     ) {
       filter = Object.assign({}, filter);
-      filter.name = `${this.s.databaseName}.${filter.name}`;
+      filter.name = this.s.namespace.withCollection(filter.name).toString();
     }
   }
 
   // No filter, filter by current database
   if (filter == null) {
-    filter.name = `/${this.s.databaseName}/`;
+    filter.name = `/${this.databaseName}/`;
   }
 
   // Rewrite the filter to use $and to filter out indexes
@@ -577,7 +616,7 @@ Db.prototype.listCollections = function(filter, options) {
   }
 
   // Return options
-  const _options = { transforms: listCollectionsTransforms(this.s.databaseName) };
+  const _options = { transforms: listCollectionsTransforms(this.databaseName) };
   // Get the cursor
   cursor = this.collection(CONSTANTS.SYSTEM_NAMESPACE_COLLECTION).find(filter, _options);
   // Do we have a readPreference, apply it
@@ -607,7 +646,13 @@ Db.prototype.eval = deprecate(function(code, parameters, options, callback) {
   parameters = args.length ? args.shift() : parameters;
   options = args.length ? args.shift() || {} : {};
 
-  return executeOperation(this.s.topology, evaluate, [this, code, parameters, options, callback]);
+  return executeLegacyOperation(this.s.topology, evaluate, [
+    this,
+    code,
+    parameters,
+    options,
+    callback
+  ]);
 }, 'Db.eval is deprecated as of MongoDB version 3.2');
 
 /**
@@ -624,16 +669,18 @@ Db.prototype.eval = deprecate(function(code, parameters, options, callback) {
  */
 Db.prototype.renameCollection = function(fromCollection, toCollection, options, callback) {
   if (typeof options === 'function') (callback = options), (options = {});
-  options = options || {};
+  options = Object.assign({}, options, { readPreference: ReadPreference.PRIMARY });
+
   // Add return new collection
   options.new_collection = true;
 
-  const collection = this.collection(fromCollection);
-  return executeOperation(this.s.topology, collection.rename.bind(collection), [
+  const renameOperation = new RenameOperation(
+    this.collection(fromCollection),
     toCollection,
-    options,
-    callback
-  ]);
+    options
+  );
+
+  return executeOperation(this.s.topology, renameOperation, callback);
 };
 
 /**
@@ -642,6 +689,10 @@ Db.prototype.renameCollection = function(fromCollection, toCollection, options,
  * @method
  * @param {string} name Name of collection to drop
  * @param {Object} [options] Optional settings
+ * @param {WriteConcern} [options.writeConcern] A full WriteConcern object
+ * @param {(number|string)} [options.w] The write concern
+ * @param {number} [options.wtimeout] The write concern timeout
+ * @param {boolean} [options.j] The journal write concern
  * @param {ClientSession} [options.session] optional session to use for this operation
  * @param {Db~resultCallback} [callback] The results callback
  * @return {Promise} returns Promise if no callback passed
@@ -650,17 +701,9 @@ Db.prototype.dropCollection = function(name, options, callback) {
   if (typeof options === 'function') (callback = options), (options = {});
   options = options || {};
 
-  // Command to execute
-  const cmd = { drop: name };
-
-  // Decorate with write concern
-  applyWriteConcern(cmd, { db: this }, options);
+  const dropCollectionOperation = new DropCollectionOperation(this, name, options);
 
-  // options
-  const opts = Object.assign({}, this.s.options, { readPreference: ReadPreference.PRIMARY });
-  if (options.session) opts.session = options.session;
-
-  return executeOperation(this.s.topology, dropCollection, [this, cmd, opts, callback]);
+  return executeOperation(this.s.topology, dropCollectionOperation, callback);
 };
 
 /**
@@ -675,22 +718,10 @@ Db.prototype.dropCollection = function(name, options, callback) {
 Db.prototype.dropDatabase = function(options, callback) {
   if (typeof options === 'function') (callback = options), (options = {});
   options = options || {};
-  // Drop database command
-  const cmd = { dropDatabase: 1 };
-
-  // Decorate with write concern
-  applyWriteConcern(cmd, { db: this }, options);
-
-  // Ensure primary only
-  const finalOptions = Object.assign({}, this.s.options, {
-    readPreference: ReadPreference.PRIMARY
-  });
 
-  if (options.session) {
-    finalOptions.session = options.session;
-  }
+  const dropDatabaseOperation = new DropDatabaseOperation(this, options);
 
-  return executeOperation(this.s.topology, dropDatabase, [this, cmd, finalOptions, callback]);
+  return executeOperation(this.s.topology, dropDatabaseOperation, callback);
 };
 
 /**
@@ -706,7 +737,9 @@ Db.prototype.collections = function(options, callback) {
   if (typeof options === 'function') (callback = options), (options = {});
   options = options || {};
 
-  return executeOperation(this.s.topology, collections, [this, options, callback]);
+  const collectionsOperation = new CollectionsOperation(this, options);
+
+  return executeOperation(this.s.topology, collectionsOperation, callback);
 };
 
 /**
@@ -722,14 +755,15 @@ Db.prototype.collections = function(options, callback) {
 Db.prototype.executeDbAdminCommand = function(selector, options, callback) {
   if (typeof options === 'function') (callback = options), (options = {});
   options = options || {};
-  options.readPreference = resolveReadPreference(options);
+  options.readPreference = resolveReadPreference(this, options);
 
-  return executeOperation(this.s.topology, executeDbAdminCommand, [
+  const executeDbAdminCommandOperation = new ExecuteDbAdminCommandOperation(
     this,
     selector,
-    options,
-    callback
-  ]);
+    options
+  );
+
+  return executeOperation(this.s.topology, executeDbAdminCommandOperation, callback);
 };
 
 /**
@@ -759,13 +793,9 @@ Db.prototype.createIndex = function(name, fieldOrSpec, options, callback) {
   if (typeof options === 'function') (callback = options), (options = {});
   options = options ? Object.assign({}, options) : {};
 
-  return executeOperation(this.s.topology, createIndex, [
-    this,
-    name,
-    fieldOrSpec,
-    options,
-    callback
-  ]);
+  const createIndexOperation = new CreateIndexOperation(this, name, fieldOrSpec, options);
+
+  return executeOperation(this.s.topology, createIndexOperation, callback);
 };
 
 /**
@@ -795,7 +825,7 @@ Db.prototype.ensureIndex = deprecate(function(name, fieldOrSpec, options, callba
   if (typeof options === 'function') (callback = options), (options = {});
   options = options || {};
 
-  return executeOperation(this.s.topology, ensureIndex, [
+  return executeLegacyOperation(this.s.topology, ensureIndex, [
     this,
     name,
     fieldOrSpec,
@@ -828,7 +858,15 @@ Db.prototype.addUser = function(username, password, options, callback) {
   if (typeof options === 'function') (callback = options), (options = {});
   options = options || {};
 
-  return executeOperation(this.s.topology, addUser, [this, 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;
+  }
+
+  const addUserOperation = new AddUserOperation(this, username, password, options);
+
+  return executeOperation(this.s.topology, addUserOperation, callback);
 };
 
 /**
@@ -847,7 +885,9 @@ Db.prototype.removeUser = function(username, options, callback) {
   if (typeof options === 'function') (callback = options), (options = {});
   options = options || {};
 
-  return executeOperation(this.s.topology, removeUser, [this, username, options, callback]);
+  const removeUserOperation = new RemoveUserOperation(this, username, options);
+
+  return executeOperation(this.s.topology, removeUserOperation, callback);
 };
 
 /**
@@ -863,7 +903,9 @@ Db.prototype.setProfilingLevel = function(level, options, callback) {
   if (typeof options === 'function') (callback = options), (options = {});
   options = options || {};
 
-  return executeOperation(this.s.topology, setProfilingLevel, [this, level, options, callback]);
+  const setProfilingLevelOperation = new SetProfilingLevelOperation(this, level, options);
+
+  return executeOperation(this.s.topology, setProfilingLevelOperation, callback);
 };
 
 /**
@@ -879,7 +921,7 @@ Db.prototype.profilingInfo = deprecate(function(options, callback) {
   if (typeof options === 'function') (callback = options), (options = {});
   options = options || {};
 
-  return executeOperation(this.s.topology, profilingInfo, [this, options, callback]);
+  return executeLegacyOperation(this.s.topology, profilingInfo, [this, options, callback]);
 }, 'Db.profilingInfo is deprecated. Query the system.profile collection directly.');
 
 /**
@@ -894,7 +936,9 @@ Db.prototype.profilingLevel = function(options, callback) {
   if (typeof options === 'function') (callback = options), (options = {});
   options = options || {};
 
-  return executeOperation(this.s.topology, profilingLevel, [this, options, callback]);
+  const profilingLevelOperation = new ProfilingLevelOperation(this, options);
+
+  return executeOperation(this.s.topology, profilingLevelOperation, callback);
 };
 
 /**
@@ -912,7 +956,9 @@ Db.prototype.indexInformation = function(name, options, callback) {
   if (typeof options === 'function') (callback = options), (options = {});
   options = options || {};
 
-  return executeOperation(this.s.topology, indexInformation, [this, name, options, callback]);
+  const indexInformationOperation = new IndexInformationOperation(this, name, options);
+
+  return executeOperation(this.s.topology, indexInformationOperation, callback);
 };
 
 /**

package/lib/dynamic_loaders.js

@@ -0,0 +1,32 @@
+'use strict';
+
+let collection;
+let cursor;
+let db;
+
+function loadCollection() {
+  if (!collection) {
+    collection = require('./collection');
+  }
+  return collection;
+}
+
+function loadCursor() {
+  if (!cursor) {
+    cursor = require('./cursor');
+  }
+  return cursor;
+}
+
+function loadDb() {
+  if (!db) {
+    db = require('./db');
+  }
+  return db;
+}
+
+module.exports = {
+  loadCollection,
+  loadCursor,
+  loadDb
+};

package/lib/error.js

@@ -1,7 +1,7 @@
 'use strict';
 
-const MongoNetworkError = require('mongodb-core').MongoNetworkError;
-const mongoErrorContextSymbol = require('mongodb-core').mongoErrorContextSymbol;
+const MongoNetworkError = require('./core').MongoNetworkError;
+const mongoErrorContextSymbol = require('./core').mongoErrorContextSymbol;
 
 const GET_MORE_NON_RESUMABLE_CODES = new Set([
   136, // CappedPositionLost
@@ -9,15 +9,15 @@ const GET_MORE_NON_RESUMABLE_CODES = new Set([
   11601 // Interrupted
 ]);
 
-// From spec@https://github.com/mongodb/specifications/blob/35e466ddf25059cb30e4113de71cdebd3754657f/source/change-streams.rst#resumable-error:
+// From spec@https://github.com/mongodb/specifications/blob/7a2e93d85935ee4b1046a8d2ad3514c657dc74fa/source/change-streams/change-streams.rst#resumable-error:
 //
 // An error is considered resumable if it meets any of the following criteria:
 // - any error encountered which is not a server error (e.g. a timeout error or network error)
-// - any server error response from a getMore command excluding those containing the following error codes
+// - any server error response from a getMore command excluding those containing the error label
+//   NonRetryableChangeStreamError and those containing the following error codes:
 //   - Interrupted: 11601
 //   - CappedPositionLost: 136
 //   - CursorKilled: 237
-// - a server error response with an error message containing the substring "not master" or "node is recovering"
 //
 // An error on an aggregate command is not a resumable error. Only errors on a getMore command may be considered resumable errors.
 
@@ -32,11 +32,13 @@ function isResumableError(error) {
     return false;
   }
 
-  return !!(
-    error instanceof MongoNetworkError ||
-    !GET_MORE_NON_RESUMABLE_CODES.has(error.code) ||
-    error.message.match(/not master/) ||
-    error.message.match(/node is recovering/)
+  if (error instanceof MongoNetworkError) {
+    return true;
+  }
+
+  return !(
+    GET_MORE_NON_RESUMABLE_CODES.has(error.code) ||
+    error.hasErrorLabel('NonRetryableChangeStreamError')
   );
 }
 

package/lib/gridfs/chunk.js

@@ -1,7 +1,7 @@
 'use strict';
 
-var Binary = require('mongodb-core').BSON.Binary,
-  ObjectID = require('mongodb-core').BSON.ObjectID;
+var Binary = require('../core').BSON.Binary,
+  ObjectID = require('../core').BSON.ObjectID;
 
 var Buffer = require('safe-buffer').Buffer;