Apply consistent-return lint rule

lib/db.js

@@ -37,7 +37,7 @@ function connect(callback) {
   mongodb.MongoClient.connect(
     config.get("MONGODB_CONNECTION_URL"),
     (err, db) => {
-      if (err) return callback(err);
+      if (err) return void callback(err);
 
       exports.mongoDb = db;
       db.collection("tasks", (err, collection) => {
@@ -47,63 +47,63 @@ function connect(callback) {
 
         if (--callbackCounter === 0 || err) {
           callbackCounter = 0;
-          return callback(err);
+          callback(err);
         }
       });
       db.collection("devices", (err, collection) => {
         exports.devicesCollection = devicesCollection = collection;
         if (--callbackCounter === 0 || err) {
           callbackCounter = 0;
-          return callback(err);
+          callback(err);
         }
       });
       db.collection("presets", (err, collection) => {
         exports.presetsCollection = presetsCollection = collection;
         if (--callbackCounter === 0 || err) {
           callbackCounter = 0;
-          return callback(err);
+          callback(err);
         }
       });
       db.collection("objects", (err, collection) => {
         exports.objectsCollection = objectsCollection = collection;
         if (--callbackCounter === 0 || err) {
           callbackCounter = 0;
-          return callback(err);
+          callback(err);
         }
       });
       db.collection("fs.files", (err, collection) => {
         exports.filesCollection = filesCollection = collection;
         if (--callbackCounter === 0 || err) {
           callbackCounter = 0;
-          return callback(err);
+          callback(err);
         }
       });
       db.collection("provisions", (err, collection) => {
         exports.provisionsCollection = provisionsCollection = collection;
         if (--callbackCounter === 0 || err) {
           callbackCounter = 0;
-          return callback(err);
+          callback(err);
         }
       });
       db.collection("virtualParameters", (err, collection) => {
         exports.virtualParametersCollection = virtualParametersCollection = collection;
         if (--callbackCounter === 0 || err) {
           callbackCounter = 0;
-          return callback(err);
+          callback(err);
         }
       });
       db.collection("faults", (err, collection) => {
         exports.faultsCollection = faultsCollection = collection;
         if (--callbackCounter === 0 || err) {
           callbackCounter = 0;
-          return callback(err);
+          callback(err);
         }
       });
-      return db.collection("operations", (err, collection) => {
+      db.collection("operations", (err, collection) => {
         exports.operationsCollection = operationsCollection = collection;
         if (--callbackCounter === 0 || err) {
           callbackCounter = 0;
-          return callback(err);
+          callback(err);
         }
       });
     }
@@ -285,7 +285,7 @@ function fetchDevice(id, timestamp, patterns, callback) {
   else proj = projection;
 
   devicesCollection.findOne({ _id: id }, proj, (err, device) => {
-    if (err || !device) return callback(err);
+    if (err || !device) return void callback(err);
 
     function storeParams(obj, path, ts, descendantsFetched, projTree) {
       let thisFetched = false;
@@ -731,7 +731,7 @@ function saveDevice(deviceId, deviceData, isNew, sessionTimestamp, callback) {
     if (!Object.keys(v).length) delete update[k];
   }
 
-  if (!Object.keys(update).length) return callback();
+  if (!Object.keys(update).length) return void callback();
 
   // Mongo doesn't allow $addToSet and $pull at the same time
   let update2;
@@ -745,13 +745,21 @@ function saveDevice(deviceId, deviceData, isNew, sessionTimestamp, callback) {
     update,
     { upsert: isNew },
     (err, result) => {
-      if (!err && result.result.n !== 1)
-        return callback(new Error(`Device ${deviceId} not found in database`));
+      if (!err && result.result.n !== 1) {
+        return void callback(
+          new Error(`Device ${deviceId} not found in database`)
+        );
+      }
 
-      if (update2)
-        return devicesCollection.update({ _id: deviceId }, update2, callback);
+      if (update2) {
+        return void devicesCollection.update(
+          { _id: deviceId },
+          update2,
+          callback
+        );
+      }
 
-      return callback(err);
+      callback(err);
     }
   );
 }
@@ -798,14 +806,14 @@ function getDueTasks(deviceId, timestamp, callback) {
   let f;
   cur.nextObject(
     (f = (err, task) => {
-      if (err) return callback(err);
+      if (err) return void callback(err);
 
-      if (!task) return callback(null, tasks, null);
+      if (!task) return void callback(null, tasks, null);
 
       if (task.timestamp) task.timestamp = +task.timestamp;
       if (task.expiry) task.expiry = +task.expiry;
       if (task.timestamp >= timestamp)
-        return callback(null, tasks, +task.timestamp);
+        return void callback(null, tasks, +task.timestamp);
       task._id = String(task._id);
 
       tasks.push(task);
@@ -818,7 +826,7 @@ function getDueTasks(deviceId, timestamp, callback) {
         else q = { _id: task.file };
 
         filesCollection.find(q).toArray((err, res) => {
-          if (err) return callback(err);
+          if (err) return void callback(err);
 
           if (res[0]) {
             if (!task.fileType) task.fileType = res[0].metadata.fileType;
@@ -847,7 +855,7 @@ function getOperations(deviceId, callback) {
   operationsCollection
     .find({ _id: { $regex: `^${common.escapeRegExp(deviceId)}\\:` } })
     .toArray((err, res) => {
-      if (err) return callback(err);
+      if (err) return void callback(err);
 
       const operations = {};
       for (const r of res) {