Apply consistent-return lint rule
This commit is contained in:
1 parent
d7f0b91bf0
commit
d85afcd2b5
12 files changed
+264
-231
No files matched your search
+23
-17
@@ -68,7 +68,7 @@ function udpConReq(address, un, key, callback) {
|
||||
const func = err => {
|
||||
if (err || --count <= 0) {
|
||||
client.close();
|
||||
return callback(err);
|
||||
return void callback(err);
|
||||
}
|
||||
client.send(message, 0, message.length, port, host, func);
|
||||
};
|
||||
@@ -85,8 +85,11 @@ function httpConReq(
|
||||
callback
|
||||
) {
|
||||
const options = URL.parse(url);
|
||||
if (options.protocol !== "http:")
|
||||
return callback(new Error("Invalid connection request URL or protocol"));
|
||||
if (options.protocol !== "http:") {
|
||||
return void callback(
|
||||
new Error("Invalid connection request URL or protocol")
|
||||
);
|
||||
}
|
||||
options.agent = new http.Agent({ maxSockets: 1 });
|
||||
|
||||
function statusToError(statusCode) {
|
||||
@@ -112,7 +115,9 @@ function httpConReq(
|
||||
if (authHeader.method === "Basic") {
|
||||
if (!allowBasicAuth) {
|
||||
request.abort();
|
||||
return callback(new Error("Basic HTTP authentication not allowed"));
|
||||
return void callback(
|
||||
new Error("Basic HTTP authentication not allowed")
|
||||
);
|
||||
}
|
||||
options.headers = {
|
||||
Authorization: auth.basic(username || "", password || "")
|
||||
@@ -205,7 +210,7 @@ function connectionRequest(deviceId, callback) {
|
||||
};
|
||||
|
||||
db.devicesCollection.findOne({ _id: deviceId }, proj, (err, device) => {
|
||||
if (err) return callback(err);
|
||||
if (err) return void callback(err);
|
||||
|
||||
let managementServer,
|
||||
connectionRequestUrl,
|
||||
@@ -245,7 +250,7 @@ function connectionRequest(deviceId, callback) {
|
||||
CONNECTION_REQUEST_ALLOW_BASIC_AUTH,
|
||||
CONNECTION_REQUEST_TIMEOUT,
|
||||
err => {
|
||||
if (udpSent) return callback();
|
||||
if (udpSent) return void callback();
|
||||
callback(err);
|
||||
}
|
||||
);
|
||||
@@ -254,7 +259,7 @@ function connectionRequest(deviceId, callback) {
|
||||
if (config.auth && config.auth.connectionRequest) {
|
||||
// Callback is optional for backward compatibility
|
||||
if (config.auth.connectionRequest.length > 4) {
|
||||
return config.auth.connectionRequest(
|
||||
return void config.auth.connectionRequest(
|
||||
deviceId,
|
||||
connectionRequestUrl,
|
||||
username,
|
||||
@@ -280,17 +285,17 @@ function connectionRequest(deviceId, callback) {
|
||||
function watchTask(deviceId, taskId, timeout, callback) {
|
||||
setTimeout(() => {
|
||||
db.tasksCollection.findOne({ _id: taskId }, { _id: 1 }, (err, task) => {
|
||||
if (err) return callback(err);
|
||||
if (err) return void callback(err);
|
||||
|
||||
if (!task) return callback(null, "completed");
|
||||
if (!task) return void callback(null, "completed");
|
||||
|
||||
const q = { _id: `${deviceId}:task_${taskId}` };
|
||||
db.faultsCollection.findOne(q, { _id: 1 }, (err, fault) => {
|
||||
if (err) return callback(err);
|
||||
if (err) return void callback(err);
|
||||
|
||||
if (fault) return callback(null, "fault");
|
||||
if (fault) return void callback(null, "fault");
|
||||
|
||||
if ((timeout -= 500) <= 0) return callback(null, "timeout");
|
||||
if ((timeout -= 500) <= 0) return void callback(null, "timeout");
|
||||
|
||||
watchTask(deviceId, taskId, timeout, callback);
|
||||
});
|
||||
@@ -311,7 +316,8 @@ function sanitizeTask(task, callback) {
|
||||
|
||||
function insertTasks(tasks, callback) {
|
||||
if (tasks && common.typeOf(tasks) !== common.ARRAY_TYPE) tasks = [tasks];
|
||||
else if (!tasks || tasks.length === 0) return callback(null, tasks || []);
|
||||
else if (!tasks || tasks.length === 0)
|
||||
return void callback(null, tasks || []);
|
||||
|
||||
let counter = tasks.length;
|
||||
for (let task of tasks) {
|
||||
@@ -330,9 +336,9 @@ function insertTasks(tasks, callback) {
|
||||
|
||||
function deleteDevice(deviceId, callback) {
|
||||
db.tasksCollection.remove({ device: deviceId }, err => {
|
||||
if (err) return callback(err);
|
||||
if (err) return void callback(err);
|
||||
db.devicesCollection.remove({ _id: deviceId }, err => {
|
||||
if (err) return callback(err);
|
||||
if (err) return void callback(err);
|
||||
db.faultsCollection.remove(
|
||||
{
|
||||
_id: {
|
||||
@@ -340,7 +346,7 @@ function deleteDevice(deviceId, callback) {
|
||||
}
|
||||
},
|
||||
err => {
|
||||
if (err) return callback(err);
|
||||
if (err) return void callback(err);
|
||||
db.operationsCollection.remove(
|
||||
{
|
||||
_id: {
|
||||
@@ -348,7 +354,7 @@ function deleteDevice(deviceId, callback) {
|
||||
}
|
||||
},
|
||||
err => {
|
||||
if (err) return callback(err);
|
||||
if (err) return void callback(err);
|
||||
cache.del(`${deviceId}_tasks_faults_operations`, callback);
|
||||
}
|
||||
);
|
||||
|
||||
Reference in new issue
Block a user