mongodb 3.0.0 → 3.0.4

package/lib/url_parser.js

@@ -10,7 +10,13 @@ module.exports = function(url, options, callback) {
   if (typeof options === 'function') (callback = options), (options = {});
   options = options || {};
 
-  let result = parser.parse(url, true);
+  let result;
+  try {
+    result = parser.parse(url, true);
+  } catch (e) {
+    return callback(new Error('URL malformed, cannot be parsed'));
+  }
+
   if (result.protocol !== 'mongodb:' && result.protocol !== 'mongodb+srv:') {
     return callback(new Error('Invalid schema, expected `mongodb` or `mongodb+srv`'));
   }
@@ -48,8 +54,9 @@ module.exports = function(url, options, callback) {
       }
     }
 
+    let base = result.auth ? `mongodb://${result.auth}@` : `mongodb://`;
     let connectionStrings = addresses.map(function(address, i) {
-      if (i === 0) return `mongodb://${address.name}:${address.port}`;
+      if (i === 0) return `${base}${address.name}:${address.port}`;
       else return `${address.name}:${address.port}`;
     });
 

package/lib/utils.js

@@ -383,29 +383,44 @@ const executeOperation = (topology, operation, args, options) => {
     opOptions = args[args.length - 2];
     if (opOptions == null || opOptions.session == null) {
       session = topology.startSession();
-      Object.assign(args[args.length - 2], { session: session });
+      const optionsIndex = args.length - 2;
+      args[optionsIndex] = Object.assign({}, args[optionsIndex], { session: session });
     } else if (opOptions.session && opOptions.session.hasEnded) {
       throw new MongoError('Use of expired sessions is not permitted');
     }
   }
 
-  // Execute using callback
-  if (typeof callback === 'function') {
-    callback = args.pop();
-    args.push((err, result) => {
+  const makeExecuteCallback = (resolve, reject) =>
+    function executeCallback(err, result) {
       if (session && !options.returnsCursor) {
         session.endSession(() => {
           delete opOptions.session;
-          if (err) return callback(err, null);
-          return resultMutator ? callback(null, resultMutator(result)) : callback(null, result);
+          if (err) return reject(err);
+          if (resultMutator) return resolve(resultMutator(result));
+          resolve(result);
         });
       } else {
-        if (err) return callback(err, null);
-        return resultMutator ? callback(null, resultMutator(result)) : callback(null, result);
+        if (err) return reject(err);
+        if (resultMutator) return resolve(resultMutator(result));
+        resolve(result);
       }
-    });
+    };
 
-    return operation.apply(null, args);
+  // Execute using callback
+  if (typeof callback === 'function') {
+    callback = args.pop();
+    const handler = makeExecuteCallback(
+      result => callback(null, result),
+      err => callback(err, null)
+    );
+    args.push(handler);
+
+    try {
+      return operation.apply(null, args);
+    } catch (e) {
+      handler(e);
+      throw e;
+    }
   }
 
   // Return a Promise
@@ -414,22 +429,14 @@ const executeOperation = (topology, operation, args, options) => {
   }
 
   return new Promise(function(resolve, reject) {
-    args[args.length - 1] = (err, r) => {
-      if (session && !options.returnsCursor) {
-        session.endSession(() => {
-          delete opOptions.session;
-          if (err) return reject(err);
-          if (resultMutator) return resolve(resultMutator(r));
-          resolve(r);
-        });
-      } else {
-        if (err) return reject(err);
-        if (resultMutator) return resolve(resultMutator(r));
-        resolve(r);
-      }
-    };
+    const handler = makeExecuteCallback(resolve, reject);
+    args[args.length - 1] = handler;
 
-    operation.apply(null, args);
+    try {
+      return operation.apply(null, args);
+    } catch (e) {
+      handler(e);
+    }
   });
 };
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mongodb",
-  "version": "3.0.0",
+  "version": "3.0.4",
   "description": "The official MongoDB driver for Node.js",
   "main": "index.js",
   "repository": {
@@ -13,7 +13,7 @@
     "official"
   ],
   "dependencies": {
-    "mongodb-core": "3.0.0"
+    "mongodb-core": "3.0.4"
   },
   "devDependencies": {
     "betterbenchmarks": "^0.1.0",
@@ -28,9 +28,11 @@
     "istanbul": "^0.4.5",
     "jsdoc": "3.5.4",
     "mongodb-extended-json": "^1.10.0",
+    "mongodb-mock-server": "^1.0.0",
     "mongodb-test-runner": "^1.1.18",
     "prettier": "^1.5.3",
     "semver": "5.4.1",
+    "sinon": "^4.3.0",
     "worker-farm": "^1.5.0"
   },
   "author": "Christian Kvalheim",