Apply consistent-return lint rule
This commit is contained in:
Zaid Abdulla committed
1 parent
d7f0b91bf0
commit
d85afcd2b5
12 files changed
+264
-231
No files matched your search
+55
-55
@@ -65,7 +65,7 @@ function writeResponse(sessionContext, res, close) {
|
||||
res.data +
|
||||
"\n\n";
|
||||
fs.appendFile(`./debug/${sessionContext.deviceId}.dump`, dump, err => {
|
||||
if (err) return throwError(err);
|
||||
if (err) throwError(err);
|
||||
});
|
||||
}
|
||||
|
||||
@@ -78,7 +78,7 @@ function writeResponse(sessionContext, res, close) {
|
||||
});
|
||||
} else if (close) {
|
||||
endSession(sessionContext, (err, isNew) => {
|
||||
if (err) return throwError(err);
|
||||
if (err) return void throwError(err);
|
||||
|
||||
if (isNew) {
|
||||
logger.accessInfo({
|
||||
@@ -115,7 +115,7 @@ function writeResponse(sessionContext, res, close) {
|
||||
|
||||
if (compress) {
|
||||
compress(res.data, (err, data) => {
|
||||
if (err) return throwError(err, sessionContext.httpResponse);
|
||||
if (err) return void throwError(err, sessionContext.httpResponse);
|
||||
|
||||
res.headers["Content-Length"] = data.length;
|
||||
sessionContext.httpResponse.writeHead(res.code, res.headers);
|
||||
@@ -187,7 +187,7 @@ function recordFault(sessionContext, fault, provisions, channels) {
|
||||
|
||||
function inform(sessionContext, rpc) {
|
||||
session.inform(sessionContext, rpc.cpeRequest, (err, acsResponse) => {
|
||||
if (err) return throwError(err, sessionContext.httpResponse);
|
||||
if (err) return void throwError(err, sessionContext.httpResponse);
|
||||
|
||||
const res = soap.response({
|
||||
id: rpc.id,
|
||||
@@ -213,7 +213,7 @@ function transferComplete(sessionContext, rpc) {
|
||||
sessionContext,
|
||||
rpc.cpeRequest,
|
||||
(err, acsResponse, operation, fault) => {
|
||||
if (err) return throwError(err, sessionContext.httpResponse);
|
||||
if (err) return void throwError(err, sessionContext.httpResponse);
|
||||
|
||||
if (!operation) {
|
||||
logger.accessWarn({
|
||||
@@ -279,7 +279,7 @@ function appendProvisions(original, toAppend) {
|
||||
function applyPresets(sessionContext) {
|
||||
const deviceData = sessionContext.deviceData;
|
||||
localCache.getPresets((err, presetsHash, presets) => {
|
||||
if (err) return throwError(err, sessionContext.httpResponse);
|
||||
if (err) return void throwError(err, sessionContext.httpResponse);
|
||||
|
||||
// Filter presets based on existing faults
|
||||
const blackList = {};
|
||||
@@ -361,15 +361,15 @@ function applyPresets(sessionContext) {
|
||||
sessionContext,
|
||||
declarations,
|
||||
(err, flt, reqId, acsReq) => {
|
||||
if (err) return throwError(err, sessionContext.httpResponse);
|
||||
if (err) return void throwError(err, sessionContext.httpResponse);
|
||||
|
||||
if (flt) {
|
||||
recordFault(sessionContext, flt);
|
||||
session.clearProvisions(sessionContext);
|
||||
return applyPresets(sessionContext);
|
||||
return void applyPresets(sessionContext);
|
||||
}
|
||||
|
||||
if (acsReq) return sendAcsRequest(sessionContext, reqId, acsReq);
|
||||
if (acsReq) return void sendAcsRequest(sessionContext, reqId, acsReq);
|
||||
|
||||
session.clearProvisions(sessionContext);
|
||||
|
||||
@@ -428,7 +428,7 @@ function applyPresets(sessionContext) {
|
||||
for (const f of Object.values(sessionContext.faults))
|
||||
delete f.retryNow;
|
||||
session.clearProvisions(sessionContext);
|
||||
return sendAcsRequest(sessionContext);
|
||||
return void sendAcsRequest(sessionContext);
|
||||
}
|
||||
|
||||
deviceData.timestamps.dirty = 0;
|
||||
@@ -437,12 +437,12 @@ function applyPresets(sessionContext) {
|
||||
sessionContext,
|
||||
null,
|
||||
(err, fault, id, acsRequest) => {
|
||||
if (err) return throwError(err, sessionContext.httpResponse);
|
||||
if (err) return void throwError(err, sessionContext.httpResponse);
|
||||
|
||||
if (fault) {
|
||||
recordFault(sessionContext, fault);
|
||||
session.clearProvisions(sessionContext);
|
||||
return applyPresets(sessionContext);
|
||||
return void applyPresets(sessionContext);
|
||||
}
|
||||
|
||||
if (!acsRequest) {
|
||||
@@ -455,13 +455,13 @@ function applyPresets(sessionContext) {
|
||||
}
|
||||
}
|
||||
|
||||
if (whiteList != null) return applyPresets(sessionContext);
|
||||
if (whiteList != null) return void applyPresets(sessionContext);
|
||||
|
||||
if (
|
||||
sessionContext.deviceData.timestamps.dirty > 1 ||
|
||||
sessionContext.deviceData.attributes.dirty > 1
|
||||
)
|
||||
return applyPresets(sessionContext);
|
||||
return void applyPresets(sessionContext);
|
||||
}
|
||||
|
||||
sendAcsRequest(sessionContext, id, acsRequest);
|
||||
@@ -474,15 +474,15 @@ function applyPresets(sessionContext) {
|
||||
|
||||
function nextRpc(sessionContext) {
|
||||
session.rpcRequest(sessionContext, null, (err, fault, id, acsRequest) => {
|
||||
if (err) return throwError(err, sessionContext.httpResponse);
|
||||
if (err) return void throwError(err, sessionContext.httpResponse);
|
||||
|
||||
if (fault) {
|
||||
recordFault(sessionContext, fault);
|
||||
session.clearProvisions(sessionContext);
|
||||
return nextRpc(sessionContext);
|
||||
return void nextRpc(sessionContext);
|
||||
}
|
||||
|
||||
if (acsRequest) return sendAcsRequest(sessionContext, id, acsRequest);
|
||||
if (acsRequest) return void sendAcsRequest(sessionContext, id, acsRequest);
|
||||
|
||||
for (let [channel, flags] of Object.entries(sessionContext.channels)) {
|
||||
if (flags && sessionContext.faults[channel]) {
|
||||
@@ -534,7 +534,7 @@ function nextRpc(sessionContext) {
|
||||
t => !sessionContext.faults[`task_${t._id}`]
|
||||
);
|
||||
|
||||
if (!task) return applyPresets(sessionContext);
|
||||
if (!task) return void applyPresets(sessionContext);
|
||||
|
||||
let alias;
|
||||
|
||||
@@ -589,7 +589,7 @@ function nextRpc(sessionContext) {
|
||||
]);
|
||||
break;
|
||||
default:
|
||||
return throwError(
|
||||
return void throwError(
|
||||
new Error("Task name not recognized"),
|
||||
sessionContext.httpResponse
|
||||
);
|
||||
@@ -611,9 +611,9 @@ function endSession(sessionContext, callback) {
|
||||
err => {
|
||||
if (err) {
|
||||
if (counter & 1) callback(err);
|
||||
return (counter = 0);
|
||||
return void (counter = 0);
|
||||
}
|
||||
if ((counter -= 2) === 1) return callback(null, sessionContext.new);
|
||||
if ((counter -= 2) === 1) callback(null, sessionContext.new);
|
||||
}
|
||||
);
|
||||
|
||||
@@ -629,7 +629,7 @@ function endSession(sessionContext, callback) {
|
||||
err => {
|
||||
if (err) {
|
||||
if (counter & 1) callback(err);
|
||||
return (counter = 0);
|
||||
return void (counter = 0);
|
||||
}
|
||||
if ((counter -= 2) === 1) callback(null, sessionContext.new);
|
||||
}
|
||||
@@ -638,7 +638,7 @@ function endSession(sessionContext, callback) {
|
||||
db.deleteOperation(sessionContext.deviceId, k, err => {
|
||||
if (err) {
|
||||
if (counter & 1) callback(err);
|
||||
return (counter = 0);
|
||||
return void (counter = 0);
|
||||
}
|
||||
if ((counter -= 2) === 1) callback(null, sessionContext.new);
|
||||
});
|
||||
@@ -652,7 +652,7 @@ function endSession(sessionContext, callback) {
|
||||
db.clearTasks(sessionContext.deviceId, sessionContext.doneTasks, err => {
|
||||
if (err) {
|
||||
if (counter & 1) callback(err);
|
||||
return (counter = 0);
|
||||
return void (counter = 0);
|
||||
}
|
||||
if ((counter -= 2) === 1) callback(null, sessionContext.new);
|
||||
});
|
||||
@@ -671,7 +671,7 @@ function endSession(sessionContext, callback) {
|
||||
err => {
|
||||
if (err) {
|
||||
if (counter & 1) callback(err);
|
||||
return (counter = 0);
|
||||
return void (counter = 0);
|
||||
}
|
||||
if ((counter -= 2) === 1) callback(null, sessionContext.new);
|
||||
}
|
||||
@@ -680,7 +680,7 @@ function endSession(sessionContext, callback) {
|
||||
db.deleteFault(sessionContext.deviceId, k, err => {
|
||||
if (err) {
|
||||
if (counter & 1) callback(err);
|
||||
return (counter = 0);
|
||||
return void (counter = 0);
|
||||
}
|
||||
if ((counter -= 2) === 1) callback(null, sessionContext.new);
|
||||
});
|
||||
@@ -699,9 +699,9 @@ function endSession(sessionContext, callback) {
|
||||
err => {
|
||||
if (err) {
|
||||
if (counter & 1) callback(err);
|
||||
return (counter = 0);
|
||||
return void (counter = 0);
|
||||
}
|
||||
if ((counter -= 2) === 1) return callback(null, sessionContext.new);
|
||||
if ((counter -= 2) === 1) callback(null, sessionContext.new);
|
||||
}
|
||||
);
|
||||
}
|
||||
@@ -710,7 +710,7 @@ function endSession(sessionContext, callback) {
|
||||
|
||||
function sendAcsRequest(sessionContext, id, acsRequest) {
|
||||
if (!acsRequest)
|
||||
return writeResponse(sessionContext, soap.response(null), true);
|
||||
return void writeResponse(sessionContext, soap.response(null), true);
|
||||
|
||||
if (acsRequest.name === "Download") {
|
||||
if (!acsRequest.url) {
|
||||
@@ -724,14 +724,14 @@ function sendAcsRequest(sessionContext, id, acsRequest) {
|
||||
}
|
||||
|
||||
if (acsRequest.fileSize == null) {
|
||||
return localCache.getFiles((err, hash, files) => {
|
||||
if (err) return throwError(err, sessionContext.httpResponse);
|
||||
return void localCache.getFiles((err, hash, files) => {
|
||||
if (err) return void throwError(err, sessionContext.httpResponse);
|
||||
|
||||
if (files[acsRequest.fileName])
|
||||
acsRequest.fileSize = files[acsRequest.fileName].length;
|
||||
else acsRequest.fileSize = 0;
|
||||
|
||||
return sendAcsRequest(sessionContext, id, acsRequest);
|
||||
sendAcsRequest(sessionContext, id, acsRequest);
|
||||
});
|
||||
}
|
||||
}
|
||||
@@ -756,14 +756,14 @@ function getSession(connection, sessionId, callback) {
|
||||
const sessionContext = currentSessions.get(connection);
|
||||
if (sessionContext) {
|
||||
currentSessions.delete(connection);
|
||||
return callback(null, sessionContext);
|
||||
return void callback(null, sessionContext);
|
||||
}
|
||||
|
||||
if (!sessionId) return callback();
|
||||
if (!sessionId) return void callback();
|
||||
|
||||
setTimeout(() => {
|
||||
cache.pop(`session_${sessionId}`, (err, sessionContextString) => {
|
||||
if (err || !sessionContextString) return callback(err);
|
||||
if (err || !sessionContextString) return void callback(err);
|
||||
session.deserialize(sessionContextString, callback);
|
||||
});
|
||||
}, 100);
|
||||
@@ -792,18 +792,18 @@ function onConnection(socket) {
|
||||
|
||||
const timeout =
|
||||
sessionContext.lastActivity + sessionContext.timeout * 1000 - now;
|
||||
if (timeout <= 0) return logger.accessError(timeoutMsg);
|
||||
if (timeout <= 0) return void logger.accessError(timeoutMsg);
|
||||
|
||||
setTimeout(() => {
|
||||
return cache.get(
|
||||
cache.get(
|
||||
`session_${sessionContext.sessionId}`,
|
||||
(err, sessionContextString) => {
|
||||
if (err) return throwError(err);
|
||||
if (err) return void throwError(err);
|
||||
|
||||
if (!sessionContextString) return;
|
||||
|
||||
session.deserialize(sessionContextString, (err, _sessionContext) => {
|
||||
if (err) return throwError(err);
|
||||
if (err) return void throwError(err);
|
||||
if (_sessionContext.lastActivity === lastActivity)
|
||||
logger.accessError(timeoutMsg);
|
||||
});
|
||||
@@ -812,13 +812,13 @@ function onConnection(socket) {
|
||||
}, timeout + 1000).unref();
|
||||
|
||||
session.serialize(sessionContext, (err, sessionContextString) => {
|
||||
if (err) return throwError(err);
|
||||
if (err) return void throwError(err);
|
||||
cache.set(
|
||||
`session_${sessionContext.sessionId}`,
|
||||
sessionContextString,
|
||||
Math.ceil(timeout / 1000) + 3,
|
||||
err => {
|
||||
if (err) return throwError(err);
|
||||
if (err) return void throwError(err);
|
||||
}
|
||||
);
|
||||
});
|
||||
@@ -843,11 +843,11 @@ setInterval(() => {
|
||||
|
||||
function getDueTasksAndFaultsAndOperations(deviceId, timestamp, callback) {
|
||||
cache.get(`${deviceId}_tasks_faults_operations`, (err, res) => {
|
||||
if (err) return callback(err);
|
||||
if (err) return void callback(err);
|
||||
|
||||
if (res) {
|
||||
res = JSON.parse(res);
|
||||
return callback(
|
||||
return void callback(
|
||||
null,
|
||||
res.tasks || [],
|
||||
res.faults || {},
|
||||
@@ -860,7 +860,7 @@ function getDueTasksAndFaultsAndOperations(deviceId, timestamp, callback) {
|
||||
db.getFaults(deviceId, (err, _faults) => {
|
||||
if (err) {
|
||||
if (callback) callback(err);
|
||||
return (callback = null);
|
||||
return void (callback = null);
|
||||
}
|
||||
faults = _faults;
|
||||
if (tasks && operations)
|
||||
@@ -870,7 +870,7 @@ function getDueTasksAndFaultsAndOperations(deviceId, timestamp, callback) {
|
||||
db.getDueTasks(deviceId, timestamp, (err, dueTasks, nextTimestamp) => {
|
||||
if (err) {
|
||||
if (callback) callback(err);
|
||||
return (callback = null);
|
||||
return void (callback = null);
|
||||
}
|
||||
tasks = dueTasks;
|
||||
cacheUntil = nextTimestamp || 0;
|
||||
@@ -881,7 +881,7 @@ function getDueTasksAndFaultsAndOperations(deviceId, timestamp, callback) {
|
||||
db.getOperations(deviceId, (err, _operations) => {
|
||||
if (err) {
|
||||
if (callback) callback(err);
|
||||
return (callback = null);
|
||||
return void (callback = null);
|
||||
}
|
||||
operations = _operations;
|
||||
if (faults && tasks)
|
||||
@@ -950,14 +950,14 @@ function processRequest(sessionContext, rpc) {
|
||||
});
|
||||
writeResponse(sessionContext, res);
|
||||
} else {
|
||||
return throwError(
|
||||
return void throwError(
|
||||
new Error("ACS method not supported"),
|
||||
sessionContext.httpResponse
|
||||
);
|
||||
}
|
||||
} else if (rpc.cpeResponse) {
|
||||
session.rpcResponse(sessionContext, rpc.id, rpc.cpeResponse, err => {
|
||||
if (err) return throwError(err, sessionContext.httpResponse);
|
||||
if (err) return void throwError(err, sessionContext.httpResponse);
|
||||
nextRpc(sessionContext);
|
||||
});
|
||||
} else if (rpc.cpeFault) {
|
||||
@@ -968,7 +968,7 @@ function processRequest(sessionContext, rpc) {
|
||||
});
|
||||
|
||||
session.rpcFault(sessionContext, rpc.id, rpc.cpeFault, (err, fault) => {
|
||||
if (err) return throwError(err, sessionContext.httpResponse);
|
||||
if (err) return void throwError(err, sessionContext.httpResponse);
|
||||
if (fault) {
|
||||
recordFault(sessionContext, fault);
|
||||
session.clearProvisions(sessionContext);
|
||||
@@ -978,7 +978,7 @@ function processRequest(sessionContext, rpc) {
|
||||
} else {
|
||||
// CPE sent empty response
|
||||
session.timeoutOperations(sessionContext, (err, faults, operations) => {
|
||||
if (err) return throwError(err, sessionContext.httpResponse);
|
||||
if (err) return void throwError(err, sessionContext.httpResponse);
|
||||
|
||||
for (let i of faults) {
|
||||
for (let [k, v] of Object.entries(operations[i].retries))
|
||||
@@ -1080,7 +1080,7 @@ function listener(httpRequest, httpResponse) {
|
||||
body +
|
||||
"\n\n";
|
||||
fs.appendFile(`./debug/${sessionContext.deviceId}.dump`, dump, err => {
|
||||
if (err) return throwError(err);
|
||||
if (err) return void throwError(err);
|
||||
});
|
||||
}
|
||||
|
||||
@@ -1088,7 +1088,7 @@ function listener(httpRequest, httpResponse) {
|
||||
}
|
||||
|
||||
getSession(httpRequest.connection, sessionId, (err, sessionContext) => {
|
||||
if (err) return throwError(err, httpResponse);
|
||||
if (err) return void throwError(err, httpResponse);
|
||||
|
||||
if (sessionContext) {
|
||||
sessionContext.httpRequest = httpRequest;
|
||||
@@ -1155,7 +1155,7 @@ function listener(httpRequest, httpResponse) {
|
||||
stats.concurrentRequests -= 1;
|
||||
return;
|
||||
}
|
||||
return parsedRpc(sessionContext, rpc, parseWarnings);
|
||||
return void parsedRpc(sessionContext, rpc, parseWarnings);
|
||||
}
|
||||
|
||||
if (!(rpc.cpeRequest && rpc.cpeRequest.name === "Inform")) {
|
||||
@@ -1180,7 +1180,7 @@ function listener(httpRequest, httpResponse) {
|
||||
rpc.cwmpVersion,
|
||||
rpc.sessionTimeout || config.get("SESSION_TIMEOUT", deviceId),
|
||||
(err, _sessionContext) => {
|
||||
if (err) return throwError(err, httpResponse);
|
||||
if (err) return void throwError(err, httpResponse);
|
||||
|
||||
_sessionContext.httpRequest = httpRequest;
|
||||
_sessionContext.httpResponse = httpResponse;
|
||||
@@ -1191,7 +1191,7 @@ function listener(httpRequest, httpResponse) {
|
||||
deviceId,
|
||||
_sessionContext.timestamp,
|
||||
(err, dueTasks, faults, operations, cacheUntil) => {
|
||||
if (err) return throwError(err, httpResponse);
|
||||
if (err) return void throwError(err, httpResponse);
|
||||
|
||||
_sessionContext.tasks = dueTasks;
|
||||
_sessionContext.operations = operations;
|
||||
|
||||
Reference in new issue
Block a user