From 7f8fbe8b65f0b6021b77543b48f36116decdcafe Mon Sep 17 00:00:00 2001 From: Koen Kanters Date: Sat, 13 Jun 2020 23:46:04 +0200 Subject: [PATCH] Lint --- lib/extension/bridge.js | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/lib/extension/bridge.js b/lib/extension/bridge.js index 8adf85d3..64474701 100644 --- a/lib/extension/bridge.js +++ b/lib/extension/bridge.js @@ -37,7 +37,12 @@ class Bridge extends Extension { async onMQTTMessage(topic, message) { const match = topic.match(requestRegex); if (match && this.requestLookup[match[1].toLowerCase()]) { - try {message = JSON.parse(message);} catch {} + try { + message = JSON.parse(message); + } catch (e) { + e; + } + try { const response = await this.requestLookup[match[1].toLowerCase()](message); await this.mqtt.publish(`bridge/response/${match[1]}`, JSON.stringify(response)); @@ -142,7 +147,7 @@ class Bridge extends Extension { const cleanup = (o) => { delete o.friendlyName; delete o.friendly_name; delete o.ID; delete o.type; delete o.devices; return o; - } + }; const oldOptions = cleanup(entity.settings); const newOptions = cleanup(settings.getEntity(ID)); return utils.getResponse(message, {from: oldOptions, to: newOptions, ID}, null); @@ -150,12 +155,13 @@ class Bridge extends Extension { renameEntity(entityType, message) { const deviceAndHasLast = entityType === 'device' && typeof message === 'object' && message.last === true; - if (typeof message !== 'object' || (!message.hasOwnProperty('from') && !deviceAndHasLast) || !message.hasOwnProperty('to')) { + if (typeof message !== 'object' || (!message.hasOwnProperty('from') && !deviceAndHasLast) || + !message.hasOwnProperty('to')) { throw new Error(`Invalid payload`); } if (deviceAndHasLast && !this.lastJoinedDeviceIeeeAddr) { - throw new Error('No device has joined since start') + throw new Error('No device has joined since start'); } const from = deviceAndHasLast ? this.lastJoinedDeviceIeeeAddr : message.from; @@ -197,7 +203,7 @@ class Bridge extends Extension { } if (force) { - await entity.device.removeFromDatabase() + await entity.device.removeFromDatabase(); } else { await entity.device.removeFromNetwork(); } @@ -230,7 +236,9 @@ class Bridge extends Extension { return utils.getResponse(message, {ID}, null); } } catch (error) { - throw new Error(`Failed to remove ${entity.type} '${entity.settings.friendlyName}'${banForceLog} (${error})`); + throw new Error( + `Failed to remove ${entity.type} '${entity.settings.friendlyName}'${banForceLog} (${error})`, + ); } }