Apply consistent-return lint rule

lib/session.js

@@ -69,7 +69,7 @@ function init(deviceId, cwmpVersion, timeout, callback) {
 
   localCache.getProvisionsAndVirtualParameters(
     (err, hash, provisions, virtualParameters) => {
-      if (err) return callback(err);
+      if (err) return void callback(err);
 
       sessionContext.presetsHash = hash;
       provisionsCache.set(sessionContext, provisions);
@@ -80,7 +80,8 @@ function init(deviceId, cwmpVersion, timeout, callback) {
 }
 
 function loadParameters(sessionContext, callback) {
-  if (!sessionContext.toLoad || !sessionContext.toLoad.size) return callback();
+  if (!sessionContext.toLoad || !sessionContext.toLoad.size)
+    return void callback();
 
   const toLoad = Array.from(sessionContext.toLoad.entries());
   db.fetchDevice(
@@ -88,7 +89,7 @@ function loadParameters(sessionContext, callback) {
     sessionContext.timestamp,
     toLoad,
     (err, parameters, loaded) => {
-      if (err) return callback(err);
+      if (err) return void callback(err);
 
       if (!parameters) {
         // Device not available in database, mark as new
@@ -211,7 +212,7 @@ function inform(sessionContext, rpcReq, callback) {
   for (const p of params) loadPath(sessionContext, p[0]);
 
   loadParameters(sessionContext, err => {
-    if (err) return callback(err);
+    if (err) return void callback(err);
 
     if (sessionContext.new) {
       params.push([
@@ -267,7 +268,8 @@ function transferComplete(sessionContext, rpcReq, callback) {
   const commandKey = rpcReq.commandKey;
   const operation = sessionContext.operations[commandKey];
 
-  if (!operation) return callback(null, { name: "TransferCompleteResponse" });
+  if (!operation)
+    return void callback(null, { name: "TransferCompleteResponse" });
 
   const instance = operation.args.instance;
 
@@ -276,7 +278,7 @@ function transferComplete(sessionContext, rpcReq, callback) {
   sessionContext.operationsTouched[commandKey] = 1;
 
   if (rpcReq.faultStruct && rpcReq.faultStruct.faultCode !== "0") {
-    return revertDownloadParameters(
+    return void revertDownloadParameters(
       sessionContext,
       operation.args.instance,
       err => {
@@ -295,7 +297,7 @@ function transferComplete(sessionContext, rpcReq, callback) {
   loadPath(sessionContext, ["Downloads", instance, "*"]);
 
   loadParameters(sessionContext, err => {
-    if (err) return callback(err);
+    if (err) return void callback(err);
 
     let toClear = null;
     const timestamp = sessionContext.timestamp + sessionContext.iteration + 1;
@@ -390,7 +392,7 @@ function revertDownloadParameters(sessionContext, instance, callback) {
   loadPath(sessionContext, ["Downloads", instance, "*"]);
 
   loadParameters(sessionContext, err => {
-    if (err) return callback(err);
+    if (err) return void callback(err);
 
     const timestamp = sessionContext.timestamp + sessionContext.iteration + 1;
 
@@ -434,8 +436,11 @@ function timeoutOperations(sessionContext, callback) {
   let counter = 3;
 
   for (const [commandKey, operation] of Object.entries(operations)) {
-    if (operation.name !== "Download")
-      return callback(new Error(`Unknown operation name ${operation.name}`));
+    if (operation.name !== "Download") {
+      return void callback(
+        new Error(`Unknown operation name ${operation.name}`)
+      );
+    }
 
     const DOWNLOAD_TIMEOUT =
       config.get("DOWNLOAD_TIMEOUT", sessionContext.deviceId) * 1000;
@@ -458,7 +463,7 @@ function timeoutOperations(sessionContext, callback) {
       revertDownloadParameters(sessionContext, operation.args.instance, err => {
         if (err) {
           if (counter & 1) callback(err);
-          return (counter = 0);
+          return void (counter = 0);
         }
         if ((counter -= 2) === 1) callback(null, faults, operations);
       });
@@ -575,7 +580,7 @@ function runProvisions(
       (err, _fault, _clear, _declarations, _done) => {
         if (err || _fault) {
           if (counter & 1) callback(err, _fault);
-          return (counter = 0);
+          return void (counter = 0);
         }
         done = done && _done;
         allDeclarations[j] = _declarations || [];
@@ -626,7 +631,7 @@ function runVirtualParameters(
       (err, _fault, _clear, _declarations, _done, _returnValue) => {
         if (err || _fault) {
           if (counter & 1) callback(err, _fault);
-          return (counter = 0);
+          return void (counter = 0);
         }
 
         done = done && _done;
@@ -642,7 +647,7 @@ function runVirtualParameters(
               });
             }
 
-            return (counter = 0);
+            return void (counter = 0);
           }
 
           const ret = {};
@@ -659,7 +664,7 @@ function runVirtualParameters(
               });
             }
 
-            return (counter = 0);
+            return void (counter = 0);
           }
 
           if (_returnValue.value != null) {
@@ -697,7 +702,7 @@ function runVirtualParameters(
                 });
               }
 
-              return (counter = 0);
+              return void (counter = 0);
             }
             ret.value = device.sanitizeParameterValue(_returnValue.value);
           } else if (provision[1].value != null || provision[2].value != null) {
@@ -708,7 +713,7 @@ function runVirtualParameters(
               });
             }
 
-            return (counter = 0);
+            return void (counter = 0);
           }
           virtualParameterUpdates[j] = ret;
         }
@@ -716,7 +721,7 @@ function runVirtualParameters(
         if ((counter -= 2) === 1) {
           allDeclarations = Array.prototype.concat.apply([], allDeclarations);
           allClear = Array.prototype.concat.apply([], allClear);
-          return callback(
+          callback(
             null,
             null,
             done ? virtualParameterUpdates : null,
@@ -731,7 +736,7 @@ function runVirtualParameters(
   if ((counter -= 2) === 1) {
     allDeclarations = Array.prototype.concat.apply([], allDeclarations);
     allClear = Array.prototype.concat.apply([], allClear);
-    return callback(
+    callback(
       null,
       null,
       done ? virtualParameterUpdates : null,
@@ -933,7 +938,7 @@ function runDeclarations(sessionContext, declarations) {
 
 function rpcRequest(sessionContext, _declarations, callback) {
   if (sessionContext.rpcRequest != null) {
-    return callback(
+    return void callback(
       null,
       null,
       generateRpcId(sessionContext),
@@ -947,7 +952,7 @@ function rpcRequest(sessionContext, _declarations, callback) {
     !(_declarations && _declarations.length) &&
     !sessionContext.provisions.length
   )
-    return callback();
+    return void callback();
 
   if (
     sessionContext.declarations.length <=
@@ -967,17 +972,17 @@ function rpcRequest(sessionContext, _declarations, callback) {
       provisions = sessionContext.virtualParameters[inception - 1];
     }
 
-    return run(
+    return void run(
       sessionContext,
       provisions,
       sessionContext.revisions[inception - 1] || 0,
       sessionContext.revisions[inception],
       (err, fault, ret, decs, toClear) => {
-        if (err) return callback(err);
+        if (err) return void callback(err);
 
         if (fault) {
           fault.timestamp = sessionContext.timestamp;
-          return callback(null, fault);
+          return void callback(null, fault);
         }
 
         // Enforce max clear timestamp
@@ -1006,10 +1011,10 @@ function rpcRequest(sessionContext, _declarations, callback) {
         }
 
         clear(sessionContext, toClear, err => {
-          if (err) return callback(err);
+          if (err) return void callback(err);
 
           loadParameters(sessionContext, err => {
-            if (err) return callback(err);
+            if (err) return void callback(err);
             rpcRequest(sessionContext, _declarations, callback);
           });
         });
@@ -1029,15 +1034,15 @@ function rpcRequest(sessionContext, _declarations, callback) {
         loadPath(sessionContext, ad[0]);
     }
 
-    return loadParameters(sessionContext, err => {
-      if (err) return callback(err);
+    return void loadParameters(sessionContext, err => {
+      if (err) return void callback(err);
 
       rpcRequest(sessionContext, null, callback);
     });
   }
 
   if (sessionContext.rpcCount >= 255) {
-    return callback(null, {
+    return void callback(null, {
       code: "too_many_rpcs",
       message: "Too many RPC requests",
       timestamp: sessionContext.timestamp
@@ -1045,7 +1050,7 @@ function rpcRequest(sessionContext, _declarations, callback) {
   }
 
   if (sessionContext.revisions.length >= 8) {
-    return callback(null, {
+    return void callback(null, {
       code: "deeply_nested_vparams",
       message:
         "Virtual parameters are referencing other virtual parameters in a deeply nested manner",
@@ -1054,7 +1059,7 @@ function rpcRequest(sessionContext, _declarations, callback) {
   }
 
   if (sessionContext.cycle >= 255) {
-    return callback(null, {
+    return void callback(null, {
       code: "too_many_cycles",
       message: "Too many provision cycles",
       timestamp: sessionContext.timestamp
@@ -1062,7 +1067,7 @@ function rpcRequest(sessionContext, _declarations, callback) {
   }
 
   if (sessionContext.iteration >= MAX_ITERATIONS * (sessionContext.cycle + 1)) {
-    return callback(null, {
+    return void callback(null, {
       code: "too_many_commits",
       message: "Too many commit iterations",
       timestamp: sessionContext.timestamp
@@ -1166,14 +1171,14 @@ function rpcRequest(sessionContext, _declarations, callback) {
       return false;
     });
 
-    return clear(sessionContext, toClear, err => {
-      if (err) return callback(err);
+    return void clear(sessionContext, toClear, err => {
+      if (err) return void callback(err);
       sessionContext.syncState.virtualParameterDeclarations[inception] = vpd;
       rpcRequest(sessionContext, null, callback);
     });
   }
 
-  if (!sessionContext.syncState) return callback();
+  if (!sessionContext.syncState) return void callback();
 
   const inception = sessionContext.declarations.length - 1;
 
@@ -1190,7 +1195,7 @@ function rpcRequest(sessionContext, _declarations, callback) {
       if (sessionContext.deviceData.changes.has("prerequisite")) {
         delete sessionContext.syncState;
         device.clearTrackers(sessionContext.deviceData, "prerequisite");
-        return rpcRequest(sessionContext, null, callback);
+        return void rpcRequest(sessionContext, null, callback);
       }
 
       let toClear;
@@ -1340,8 +1345,8 @@ function rpcRequest(sessionContext, _declarations, callback) {
       }
 
       if (toClear || sessionContext.deviceData.changes.has("prerequisite")) {
-        return clear(sessionContext, toClear, err => {
-          if (err) return callback(err);
+        return void clear(sessionContext, toClear, err => {
+          if (err) return void callback(err);
           rpcRequest(sessionContext, null, callback);
         });
       }
@@ -1358,11 +1363,11 @@ function rpcRequest(sessionContext, _declarations, callback) {
   if (provisions) {
     sessionContext.virtualParameters.push(provisions);
     sessionContext.revisions.push(sessionContext.revisions[inception]);
-    return rpcRequest(sessionContext, null, callback);
+    return void rpcRequest(sessionContext, null, callback);
   }
 
   if (sessionContext.rpcRequest) {
-    return callback(
+    return void callback(
       null,
       null,
       generateRpcId(sessionContext),
@@ -1375,7 +1380,7 @@ function rpcRequest(sessionContext, _declarations, callback) {
   sessionContext.syncState.virtualParameterDeclarations.pop();
 
   const ret = sessionContext.provisionsRet.splice(inception)[0];
-  if (!ret) return rpcRequest(sessionContext, null, callback);
+  if (!ret) return void rpcRequest(sessionContext, null, callback);
 
   sessionContext.revisions.pop();
   const rev =
@@ -1391,7 +1396,7 @@ function rpcRequest(sessionContext, _declarations, callback) {
   }
 
   const vparams = sessionContext.virtualParameters.pop();
-  if (!vparams) return callback();
+  if (!vparams) return void callback();
 
   const timestamp = sessionContext.timestamp + sessionContext.iteration;
   let toClear;
@@ -1409,7 +1414,7 @@ function rpcRequest(sessionContext, _declarations, callback) {
   }
 
   clear(sessionContext, toClear, err => {
-    if (err) return callback(err);
+    if (err) return void callback(err);
     rpcRequest(sessionContext, null, callback);
   });
 }
@@ -2154,7 +2159,7 @@ function processInstances(
 }
 
 function clear(sessionContext, toClear, callback) {
-  if (!toClear || !toClear.length) return callback();
+  if (!toClear || !toClear.length) return void callback();
 
   const MAX_DEPTH = config.get("MAX_DEPTH", sessionContext.deviceId);
 
@@ -2178,7 +2183,7 @@ function clear(sessionContext, toClear, callback) {
   }
 
   loadParameters(sessionContext, err => {
-    if (err) return callback(err);
+    if (err) return void callback(err);
     for (const c of toClear)
       device.clear(sessionContext.deviceData, c[0], c[1], c[2], c[3]);
 
@@ -2188,7 +2193,7 @@ function clear(sessionContext, toClear, callback) {
 
 function rpcResponse(sessionContext, id, rpcRes, callback) {
   if (id !== generateRpcId(sessionContext))
-    return callback(new Error("Request ID not recognized"));
+    return void callback(new Error("Request ID not recognized"));
 
   ++sessionContext.rpcCount;
 
@@ -2248,8 +2253,11 @@ function rpcResponse(sessionContext, id, rpcRes, callback) {
 
   switch (rpcRes.name) {
     case "GetParameterValuesResponse":
-      if (rpcReq.name !== "GetParameterValues")
-        return callback(new Error("Response name does not match request name"));
+      if (rpcReq.name !== "GetParameterValues") {
+        return void callback(
+          new Error("Response name does not match request name")
+        );
+      }
 
       for (const p of rpcRes.parameterList) {
         toClear = device.set(
@@ -2263,8 +2271,11 @@ function rpcResponse(sessionContext, id, rpcRes, callback) {
 
       break;
     case "GetParameterNamesResponse":
-      if (rpcReq.name !== "GetParameterNames")
-        return callback(new Error("Response name does not match request name"));
+      if (rpcReq.name !== "GetParameterNames") {
+        return void callback(
+          new Error("Response name does not match request name")
+        );
+      }
 
       if (rpcReq.parameterPath.endsWith("."))
         root = common.parsePath(rpcReq.parameterPath.slice(0, -1));
@@ -2333,7 +2344,7 @@ function rpcResponse(sessionContext, id, rpcRes, callback) {
       }
 
       loadParameters(sessionContext, err => {
-        if (err) return callback(err);
+        if (err) return void callback(err);
 
         if (!root.length) {
           for (const n of [
@@ -2365,8 +2376,11 @@ function rpcResponse(sessionContext, id, rpcRes, callback) {
       });
       return;
     case "SetParameterValuesResponse":
-      if (rpcReq.name !== "SetParameterValues")
-        return callback(new Error("Response name does not match request name"));
+      if (rpcReq.name !== "SetParameterValues") {
+        return void callback(
+          new Error("Response name does not match request name")
+        );
+      }
 
       for (const p of rpcReq.parameterList) {
         toClear = device.set(
@@ -2505,7 +2519,7 @@ function rpcResponse(sessionContext, id, rpcRes, callback) {
       }
       break;
     default:
-      return callback(new Error("Response name not recognized"));
+      return void callback(new Error("Response name not recognized"));
   }
   clear(sessionContext, toClear, callback);
 }
@@ -2527,12 +2541,12 @@ function rpcFault(sessionContext, id, faultResponse, callback) {
 function deserialize(sessionContextString, callback) {
   localCache.getProvisionsAndVirtualParameters(
     (err, hash, provisions, virtualParameters) => {
-      if (err) return callback(err);
+      if (err) return void callback(err);
 
       const sessionContext = JSON.parse(sessionContextString);
 
       if (sessionContext.presetsHash && sessionContext.presetsHash !== hash)
-        return callback(new Error("Preset hash mismatch"));
+        return void callback(new Error("Preset hash mismatch"));
 
       provisionsCache.set(sessionContext, provisions);
       virtualParametersCache.set(sessionContext, virtualParameters);