mongodb 2.2.30 → 2.2.31

package/HISTORY.md

@@ -1,3 +1,10 @@
+2.2.31 2017-08-08
+-----------------
+* update mongodb-core to 2.2.15
+* allow auth option in MongoClient.connect
+* remove duplicate option `promoteLongs` from MongoClient's `connect`
+* bulk operations should not throw an error on empty batch
+
 2.2.30 2017-07-07
 -----------------
 * Update mongodb-core to 2.2.14

package/lib/bulk/ordered.js

@@ -488,30 +488,37 @@ var executeCommands = function(self, callback) {
  */
 OrderedBulkOperation.prototype.execute = function(_writeConcern, callback) {
   var self = this;
-  if(this.s.executed) throw new toError("batch cannot be re-executed");
-  if(typeof _writeConcern == 'function') {
+  if (this.s.executed) {
+    var executedError = toError('batch cannot be re-executed');
+    return (typeof callback === 'function') ?
+      callback(executedError, null) : this.s.promiseLibrary.reject(executedError);
+  }
+
+  if (typeof _writeConcern === 'function') {
     callback = _writeConcern;
-	} else if(_writeConcern && typeof _writeConcern == 'object') {
+  } else if (_writeConcern && typeof _writeConcern === 'object') {
     this.s.writeConcern = _writeConcern;
   }
 
   // If we have current batch
-  if(this.s.currentBatch) this.s.batches.push(this.s.currentBatch)
+  if (this.s.currentBatch) this.s.batches.push(this.s.currentBatch)
 
   // If we have no operations in the bulk raise an error
-  if(this.s.batches.length == 0) {
-    throw toError("Invalid Operation, No operations in bulk");
+  if (this.s.batches.length == 0) {
+    var emptyBatchError = toError('Invalid Operation, no operations specified');
+    return (typeof callback === 'function') ?
+      callback(emptyBatchError, null) : this.s.promiseLibrary.reject(emptyBatchError);
   }
 
   // Execute using callback
-  if(typeof callback == 'function') {
-		return executeCommands(this, callback);
-	}
+  if (typeof callback === 'function') {
+    return executeCommands(this, callback);
+  }
 
   // Return a Promise
   return new this.s.promiseLibrary(function(resolve, reject) {
     executeCommands(self, function(err, r) {
-      if(err) return reject(err);
+      if (err) return reject(err);
       resolve(r);
     });
   });

package/lib/bulk/unordered.js

@@ -490,30 +490,37 @@ var executeBatches = function(self, callback) {
  */
 UnorderedBulkOperation.prototype.execute = function(_writeConcern, callback) {
   var self = this;
-  if(this.s.executed) throw toError("batch cannot be re-executed");
-  if(typeof _writeConcern == 'function') {
+  if (this.s.executed) {
+    var executedError = toError('batch cannot be re-executed');
+    return (typeof callback === 'function') ?
+      callback(executedError, null) : this.s.promiseLibrary.reject(executedError);
+  }
+
+  if (typeof _writeConcern === 'function') {
     callback = _writeConcern;
-  } else if(_writeConcern && typeof _writeConcern == 'object') {
+  } else if (_writeConcern && typeof _writeConcern === 'object') {
     this.s.writeConcern = _writeConcern;
   }
 
   // If we have current batch
-  if(this.s.currentInsertBatch) this.s.batches.push(this.s.currentInsertBatch);
-  if(this.s.currentUpdateBatch) this.s.batches.push(this.s.currentUpdateBatch);
-  if(this.s.currentRemoveBatch) this.s.batches.push(this.s.currentRemoveBatch);
+  if (this.s.currentInsertBatch) this.s.batches.push(this.s.currentInsertBatch);
+  if (this.s.currentUpdateBatch) this.s.batches.push(this.s.currentUpdateBatch);
+  if (this.s.currentRemoveBatch) this.s.batches.push(this.s.currentRemoveBatch);
 
   // If we have no operations in the bulk raise an error
-  if(this.s.batches.length == 0) {
-    throw toError("Invalid Operation, No operations in bulk");
+  if (this.s.batches.length == 0) {
+    var emptyBatchError = toError('Invalid Operation, no operations specified');
+    return (typeof callback === 'function') ?
+      callback(emptyBatchError, null) : this.s.promiseLibrary.reject(emptyBatchError);
   }
 
   // Execute using callback
-  if(typeof callback == 'function') return executeBatches(this, callback);
+  if (typeof callback === 'function') return executeBatches(this, callback);
 
   // Return a Promise
   return new this.s.promiseLibrary(function(resolve, reject) {
     executeBatches(self, function(err, r) {
-      if(err) return reject(err);
+      if (err) return reject(err);
       resolve(r);
     });
   });

package/lib/mongo_client.js

@@ -35,10 +35,10 @@ var validOptionNames = ['poolSize', 'ssl', 'sslValidate', 'sslCA', 'sslCert',
   'socketTimeoutMS', 'reconnectTries', 'reconnectInterval', 'ha', 'haInterval',
   'replicaSet', 'secondaryAcceptableLatencyMS', 'acceptableLatencyMS',
   'connectWithNoPrimary', 'authSource', 'w', 'wtimeout', 'j', 'forceServerObjectId',
-  'serializeFunctions', 'ignoreUndefined', 'raw', 'promoteLongs', 'bufferMaxEntries',
+  'serializeFunctions', 'ignoreUndefined', 'raw', 'bufferMaxEntries',
   'readPreference', 'pkFactory', 'promiseLibrary', 'readConcern', 'maxStalenessSeconds',
   'loggerLevel', 'logger', 'promoteValues', 'promoteBuffers', 'promoteLongs',
-  'domainsEnabled', 'keepAliveInitialDelay', 'checkServerIdentity', 'validateOptions', 'appname'];
+  'domainsEnabled', 'keepAliveInitialDelay', 'checkServerIdentity', 'validateOptions', 'appname', 'auth'];
 var ignoreOptionNames = ['native_parser'];
 var legacyOptionNames = ['server', 'replset', 'replSet', 'mongos', 'db'];
 
@@ -114,6 +114,8 @@ function MongoClient() {
    * @param {number} [options.acceptableLatencyMS=15] Cutoff latency point in MS for Mongos proxies selection.
    * @param {boolean} [options.connectWithNoPrimary=false] Sets if the driver should connect even if no primary is available
    * @param {string} [options.authSource=undefined] Define the database to authenticate against
+   * @param {string} [options.auth.user=undefined] The username for auth
+   * @param {string} [options.auth.password=undefined] The username for auth
    * @param {(number|string)} [options.w=null] The write concern.
    * @param {number} [options.wtimeout=null] The write concern timeout.
    * @param {boolean} [options.j=false] Specify a journal write concern.
@@ -183,6 +185,8 @@ var define = MongoClient.define = new Define('MongoClient', MongoClient, false);
  * @param {number} [options.acceptableLatencyMS=15] Cutoff latency point in MS for Mongos proxies selection.
  * @param {boolean} [options.connectWithNoPrimary=false] Sets if the driver should connect even if no primary is available
  * @param {string} [options.authSource=undefined] Define the database to authenticate against
+ * @param {string} [options.auth.user=undefined] The username for auth
+ * @param {string} [options.auth.password=undefined] The username for auth
  * @param {(number|string)} [options.w=null] The write concern.
  * @param {number} [options.wtimeout=null] The write concern timeout.
  * @param {boolean} [options.j=false] Specify a journal write concern.
@@ -488,6 +492,10 @@ var connect = function(self, url, options, callback) {
   if(_finalOptions.socketTimeoutMS == null) _finalOptions.socketTimeoutMS = 360000;
   if(_finalOptions.connectTimeoutMS == null) _finalOptions.connectTimeoutMS = 30000;
 
+  if (_finalOptions.db_options && _finalOptions.db_options.auth) {
+    delete _finalOptions.db_options.auth;
+  }
+
   // Failure modes
   if(object.servers.length == 0) {
     throw new Error("connection string must contain at least one seed host");

package/lib/url_parser.js

@@ -145,6 +145,8 @@ module.exports = function(url, options) {
 
   // Add auth to final object if we have 2 elements
   if(auth.length == 2) object.auth = {user: auth[0], password: auth[1]};
+  // if user provided auth options, use that
+  if(options && options.auth != null) object.auth = options.auth;
 
   // Variables used for temporary storage
   var hostPart;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mongodb",
-  "version": "2.2.30",
+  "version": "2.2.31",
   "description": "The official MongoDB driver for Node.js",
   "main": "index.js",
   "repository": {
@@ -14,7 +14,7 @@
   ],
   "dependencies": {
     "es6-promise": "3.2.1",
-    "mongodb-core": "2.1.14",
+    "mongodb-core": "2.1.15",
     "readable-stream": "2.2.7"
   },
   "devDependencies": {
@@ -50,7 +50,7 @@
     "url": "https://github.com/mongodb/node-mongodb-native/issues"
   },
   "scripts": {
-    "test": "node test/runner.js -t functional -l",
+    "test": "node test/runner.js -t functional",
     "coverage": "node_modules/.bin/nyc node test/runner.js -t functional && node_modules/.bin/nyc report --reporter=text-lcov | node_modules/.bin/coveralls",
     "lint": "eslint lib"
   },

package/yarn.lock

@@ -19,7 +19,7 @@ acorn@^3.0.4:
   version "3.3.0"
   resolved "https://registry.yarnpkg.com/acorn/-/acorn-3.3.0.tgz#45e37fb39e8da3f25baee3ff5369e2bb5f22017a"
 
-acorn@^5.0.1:
+acorn@^5.1.1:
   version "5.1.1"
   resolved "https://registry.yarnpkg.com/acorn/-/acorn-5.1.1.tgz#53fe161111f912ab999ee887a90a0bc52822fd75"
 
@@ -264,8 +264,8 @@ babel-register@^6.24.1:
     source-map-support "^0.4.2"
 
 babel-runtime@^6.22.0:
-  version "6.23.0"
-  resolved "https://registry.yarnpkg.com/babel-runtime/-/babel-runtime-6.23.0.tgz#0a9489f144de70efb3ce4300accdb329e2fc543b"
+  version "6.25.0"
+  resolved "https://registry.yarnpkg.com/babel-runtime/-/babel-runtime-6.25.0.tgz#33b98eaa5d482bb01a8d1aa6b437ad2b01aec41c"
   dependencies:
     core-js "^2.4.0"
     regenerator-runtime "^0.10.0"
@@ -441,8 +441,8 @@ caseless@~0.11.0:
   resolved "https://registry.yarnpkg.com/caseless/-/caseless-0.11.0.tgz#715b96ea9841593cc33067923f5ec60ebda4f7d7"
 
 catharsis@~0.8.7:
-  version "0.8.8"
-  resolved "https://registry.yarnpkg.com/catharsis/-/catharsis-0.8.8.tgz#693479f43aac549d806bd73e924cd0d944951a06"
+  version "0.8.9"
+  resolved "https://registry.yarnpkg.com/catharsis/-/catharsis-0.8.9.tgz#98cc890ca652dd2ef0e70b37925310ff9e90fc8b"
   dependencies:
     underscore-contrib "~0.3.0"
 
@@ -480,8 +480,8 @@ cheerio@^0.19.0:
     lodash "^3.2.0"
 
 circular-json@^0.3.1:
-  version "0.3.1"
-  resolved "https://registry.yarnpkg.com/circular-json/-/circular-json-0.3.1.tgz#be8b36aefccde8b3ca7aa2d6afc07a37242c0d2d"
+  version "0.3.3"
+  resolved "https://registry.yarnpkg.com/circular-json/-/circular-json-0.3.3.tgz#815c99ea84f6809529d2f45791bdf82711352d66"
 
 cli-cursor@^1.0.1:
   version "1.0.2"
@@ -562,10 +562,10 @@ convert-source-map@^1.1.0, convert-source-map@^1.3.0:
   resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.5.0.tgz#9acd70851c6d5dfdd93d9282e5edf94a03ff46b5"
 
 core-js@^2.4.0:
-  version "2.4.1"
-  resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.4.1.tgz#4de911e667b0eae9124e34254b53aea6fc618d3e"
+  version "2.5.0"
+  resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.5.0.tgz#569c050918be6486b3837552028ae0466b717086"
 
-core-util-is@~1.0.0:
+core-util-is@1.0.2, core-util-is@~1.0.0:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.2.tgz#b5fd54220aa2bc5ab57aab7140c940754503c1a7"
 
@@ -762,8 +762,8 @@ error-ex@^1.2.0:
     is-arrayish "^0.2.1"
 
 es5-ext@^0.10.14, es5-ext@^0.10.9, es5-ext@~0.10.14:
-  version "0.10.23"
-  resolved "https://registry.yarnpkg.com/es5-ext/-/es5-ext-0.10.23.tgz#7578b51be974207a5487821b56538c224e4e7b38"
+  version "0.10.26"
+  resolved "https://registry.yarnpkg.com/es5-ext/-/es5-ext-0.10.26.tgz#51b2128a531b70c4f6764093a73cbebb82186372"
   dependencies:
     es6-iterator "2"
     es6-symbol "~3.1"
@@ -881,10 +881,10 @@ eslint@^3.8.1:
     user-home "^2.0.0"
 
 espree@^3.4.0:
-  version "3.4.3"
-  resolved "https://registry.yarnpkg.com/espree/-/espree-3.4.3.tgz#2910b5ccd49ce893c2ffffaab4fd8b3a31b82374"
+  version "3.5.0"
+  resolved "https://registry.yarnpkg.com/espree/-/espree-3.5.0.tgz#98358625bdd055861ea27e2867ea729faf463d8d"
   dependencies:
-    acorn "^5.0.1"
+    acorn "^5.1.1"
     acorn-jsx "^3.0.0"
 
 espree@~2.2.3:
@@ -899,6 +899,10 @@ esprima@^2.6.0:
   version "2.7.3"
   resolved "https://registry.yarnpkg.com/esprima/-/esprima-2.7.3.tgz#96e3b70d5779f6ad49cd032673d1c312767ba581"
 
+esprima@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/esprima/-/esprima-4.0.0.tgz#4499eddcd1110e0b218bacf2fa7f7f59f55ca804"
+
 esquery@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/esquery/-/esquery-1.0.0.tgz#cfba8b57d7fba93f17298a8a006a04cda13d80fa"
@@ -977,9 +981,9 @@ extglob@^0.3.1:
   dependencies:
     is-extglob "^1.0.0"
 
-extsprintf@1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.0.2.tgz#e1080e0658e300b06294990cc70e1502235fd550"
+extsprintf@1.3.0, extsprintf@^1.2.0:
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.3.0.tgz#96918440e3041a7a414f8c52e3c574eb3c3e1e05"
 
 fast-levenshtein@~2.0.4:
   version "2.0.6"
@@ -1516,8 +1520,8 @@ istanbul-lib-hook@^1.0.0-alpha.4:
     append-transform "^0.4.0"
 
 istanbul-lib-instrument@^1.2.0:
-  version "1.7.3"
-  resolved "https://registry.yarnpkg.com/istanbul-lib-instrument/-/istanbul-lib-instrument-1.7.3.tgz#925b239163eabdd68cc4048f52c2fa4f899ecfa7"
+  version "1.7.4"
+  resolved "https://registry.yarnpkg.com/istanbul-lib-instrument/-/istanbul-lib-instrument-1.7.4.tgz#e9fd920e4767f3d19edc765e2d6b3f5ccbd0eea8"
   dependencies:
     babel-generator "^6.18.0"
     babel-template "^6.16.0"
@@ -1556,13 +1560,20 @@ js-tokens@^3.0.0:
   version "3.0.2"
   resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-3.0.2.tgz#9866df395102130e38f7f996bceb65443209c25b"
 
-js-yaml@3.6.1, js-yaml@^3.5.1:
+js-yaml@3.6.1:
   version "3.6.1"
   resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.6.1.tgz#6e5fe67d8b205ce4d22fad05b7781e8dadcc4b30"
   dependencies:
     argparse "^1.0.7"
     esprima "^2.6.0"
 
+js-yaml@^3.5.1:
+  version "3.9.1"
+  resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.9.1.tgz#08775cebdfdd359209f0d2acd383c8f86a6904a0"
+  dependencies:
+    argparse "^1.0.7"
+    esprima "^4.0.0"
+
 js2xmlparser@~1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/js2xmlparser/-/js2xmlparser-1.0.0.tgz#5a170f2e8d6476ce45405e04823242513782fe30"
@@ -1629,13 +1640,13 @@ jsonpointer@^4.0.0:
   resolved "https://registry.yarnpkg.com/jsonpointer/-/jsonpointer-4.0.1.tgz#4fd92cb34e0e9db3c89c8622ecf51f9b978c6cb9"
 
 jsprim@^1.2.2:
-  version "1.4.0"
-  resolved "https://registry.yarnpkg.com/jsprim/-/jsprim-1.4.0.tgz#a3b87e40298d8c380552d8cc7628a0bb95a22918"
+  version "1.4.1"
+  resolved "https://registry.yarnpkg.com/jsprim/-/jsprim-1.4.1.tgz#313e66bc1e5cc06e438bc1b7499c2e5c56acb6a2"
   dependencies:
     assert-plus "1.0.0"
-    extsprintf "1.0.2"
+    extsprintf "1.3.0"
     json-schema "0.2.3"
-    verror "1.3.6"
+    verror "1.10.0"
 
 kerberos@^0.0.23:
   version "0.0.23"
@@ -1945,15 +1956,15 @@ micromatch@^2.3.11:
     parse-glob "^3.0.4"
     regex-cache "^0.4.2"
 
-mime-db@~1.27.0:
-  version "1.27.0"
-  resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.27.0.tgz#820f572296bbd20ec25ed55e5b5de869e5436eb1"
+mime-db@~1.29.0:
+  version "1.29.0"
+  resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.29.0.tgz#48d26d235589651704ac5916ca06001914266878"
 
 mime-types@^2.1.12, mime-types@~2.1.7:
-  version "2.1.15"
-  resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.15.tgz#a4ebf5064094569237b8cf70046776d09fc92aed"
+  version "2.1.16"
+  resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.16.tgz#2b858a52e5ecd516db897ac2be87487830698e23"
   dependencies:
-    mime-db "~1.27.0"
+    mime-db "~1.29.0"
 
 minimatch@^3.0.2, minimatch@^3.0.4:
   version "3.0.4"
@@ -1987,13 +1998,6 @@ moment@^2.10.6:
   version "2.18.1"
   resolved "https://registry.yarnpkg.com/moment/-/moment-2.18.1.tgz#c36193dd3ce1c2eed2adb7c802dbbc77a81b1c0f"
 
-mongodb-core@2.1.13:
-  version "2.1.13"
-  resolved "https://registry.yarnpkg.com/mongodb-core/-/mongodb-core-2.1.13.tgz#771ef638270ac993ab42984689ab824251b96a88"
-  dependencies:
-    bson "~1.0.4"
-    require_optional "~1.0.0"
-
 mongodb-core@2.1.14, mongodb-core@^2.1.12:
   version "2.1.14"
   resolved "https://registry.yarnpkg.com/mongodb-core/-/mongodb-core-2.1.14.tgz#13cba2764226b5be3d18992af0c963ce5ea0f0fd"
@@ -2074,11 +2078,11 @@ mongodb-version-manager@christkv/mongodb-version-manager#master:
     unzip "^0.1.11"
 
 mongodb@^2.0.39:
-  version "2.2.29"
-  resolved "https://registry.yarnpkg.com/mongodb/-/mongodb-2.2.29.tgz#36b244126f26766c5ebd6465b8ab5b542d6833c5"
+  version "2.2.30"
+  resolved "https://registry.yarnpkg.com/mongodb/-/mongodb-2.2.30.tgz#8ccd801f676c8172040c2f2b47e9602a0d5634ab"
   dependencies:
     es6-promise "3.2.1"
-    mongodb-core "2.1.13"
+    mongodb-core "2.1.14"
     readable-stream "2.2.7"
 
 ms@0.7.1:
@@ -2555,8 +2559,8 @@ resolve-from@^2.0.0:
   resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-2.0.0.tgz#9480ab20e94ffa1d9e80a804c7ea147611966b57"
 
 resolve@^1.1.6:
-  version "1.3.3"
-  resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.3.3.tgz#655907c3469a8680dc2de3a275a8fdd69691f0e5"
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.4.0.tgz#a75be01c53da25d934a98ebd0e4c4a7312f92a86"
   dependencies:
     path-parse "^1.0.5"
 
@@ -2757,8 +2761,8 @@ string-width@^1.0.1, string-width@^1.0.2:
     strip-ansi "^3.0.0"
 
 string-width@^2.0.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/string-width/-/string-width-2.1.0.tgz#030664561fc146c9423ec7d978fe2457437fe6d0"
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/string-width/-/string-width-2.1.1.tgz#ab93f27a8dc13d28cac815c462143a6d9012ae9e"
   dependencies:
     is-fullwidth-code-point "^2.0.0"
     strip-ansi "^4.0.0"
@@ -3005,19 +3009,21 @@ validate-npm-package-license@^3.0.1:
     spdx-correct "~1.0.0"
     spdx-expression-parse "~1.0.0"
 
-verror@1.3.6:
-  version "1.3.6"
-  resolved "https://registry.yarnpkg.com/verror/-/verror-1.3.6.tgz#cff5df12946d297d2baaefaa2689e25be01c005c"
+verror@1.10.0:
+  version "1.10.0"
+  resolved "https://registry.yarnpkg.com/verror/-/verror-1.10.0.tgz#3a105ca17053af55d6e270c1f8288682e18da400"
   dependencies:
-    extsprintf "1.0.2"
+    assert-plus "^1.0.0"
+    core-util-is "1.0.2"
+    extsprintf "^1.2.0"
 
 which-module@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/which-module/-/which-module-1.0.0.tgz#bba63ca861948994ff307736089e3b96026c2a4f"
 
 which@^1.1.1, which@^1.2.4, which@^1.2.9:
-  version "1.2.14"
-  resolved "https://registry.yarnpkg.com/which/-/which-1.2.14.tgz#9a87c4378f03e827cecaf1acdf56c736c01c14e5"
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/which/-/which-1.3.0.tgz#ff04bdfc010ee547d780bec38e1ac1c2777d253a"
   dependencies:
     isexe "^2.0.0"