From cb3ec452941dc2cdba493d481dd702766ba016c0 Mon Sep 17 00:00:00 2001 From: Koen Kanters Date: Sat, 26 Oct 2019 18:25:51 +0200 Subject: [PATCH] Fix lint. --- lib/controller.js | 20 ++++++++++---------- lib/extension/deviceBind.js | 6 +++--- lib/extension/deviceConfigure.js | 2 +- lib/extension/deviceGroupMembership.js | 2 +- lib/extension/deviceReceive.js | 2 +- lib/extension/deviceReport.js | 6 +++--- lib/extension/networkMap.js | 2 +- lib/zigbee.js | 2 +- 8 files changed, 21 insertions(+), 21 deletions(-) diff --git a/lib/controller.js b/lib/controller.js index b4ce78752..5dc05be50 100644 --- a/lib/controller.js +++ b/lib/controller.js @@ -45,26 +45,26 @@ class Controller { if (settings.get().advanced.report) { this.extensions.push(new ExtensionDeviceReport( - this.zigbee, this.mqtt, this.state, this.publishEntityState + this.zigbee, this.mqtt, this.state, this.publishEntityState, )); } if (settings.get().homeassistant) { this.extensions.push(new ExtensionHomeAssistant( - this.zigbee, this.mqtt, this.state, this.publishEntityState + this.zigbee, this.mqtt, this.state, this.publishEntityState, )); } /* istanbul ignore next */ if (settings.get().advanced.soft_reset_timeout !== 0) { this.extensions.push(new ExtensionSoftReset( - this.zigbee, this.mqtt, this.state, this.publishEntityState + this.zigbee, this.mqtt, this.state, this.publishEntityState, )); } if (settings.get().advanced.availability_timeout) { this.extensions.push(new ExtensionDeviceAvailability( - this.zigbee, this.mqtt, this.state, this.publishEntityState + this.zigbee, this.mqtt, this.state, this.publishEntityState, )); } } @@ -77,7 +77,7 @@ class Controller { logger.error(`\t - ${error}`); } logger.error( - `If you don't know how to solve this, read https://www.zigbee2mqtt.io/configuration/configuration.html` + `If you don't know how to solve this, read https://www.zigbee2mqtt.io/configuration/configuration.html`, ); process.exit(1); } @@ -112,7 +112,7 @@ class Controller { (entity.mapped ? `${entity.mapped.model} - ${entity.mapped.vendor} ${entity.mapped.description} ` : 'Not supported ') + - `(${entity.device.type})` + `(${entity.device.type})`, ); } @@ -180,7 +180,7 @@ class Controller { logger.debug( `Received Zigbee message from '${name}', type '${data.type}', cluster '${data.cluster}'` + `, data '${JSON.stringify(data.data)}' from endpoint ${data.endpoint.ID}` + - (data.hasOwnProperty('groupID') ? ` with groupID ${data.groupID}` : ``) + (data.hasOwnProperty('groupID') ? ` with groupID ${data.groupID}` : ``), ); } else if (type === 'deviceJoined') { logger.info(`Device '${name}' joined`); @@ -192,7 +192,7 @@ class Controller { if (entity.mapped) { const {vendor, description, model} = entity.mapped; logger.info( - `Device '${name}' is supported, identified as: ${vendor} ${description} (${model})` + `Device '${name}' is supported, identified as: ${vendor} ${description} (${model})`, ); const log = {friendly_name: name, model, vendor, description, supported: true}; @@ -200,7 +200,7 @@ class Controller { } else { logger.warn( `Device '${name}' with Zigbee model '${data.device.modelID}' is NOT supported, ` + - `please follow https://www.zigbee2mqtt.io/how_tos/how_to_support_new_devices.html` + `please follow https://www.zigbee2mqtt.io/how_tos/how_to_support_new_devices.html`, ); this.mqtt.log('pairing', 'interview_successful', {friendly_name: name, supported: false}); } @@ -227,7 +227,7 @@ class Controller { // Call extensions this.callExtensionMethod( 'onZigbeeEvent', - [type, data, entity ? entity.mapped : null, entity ? entity.settings : null] + [type, data, entity ? entity.mapped : null, entity ? entity.settings : null], ); } diff --git a/lib/extension/deviceBind.js b/lib/extension/deviceBind.js index 520c781fe..4506c52d1 100644 --- a/lib/extension/deviceBind.js +++ b/lib/extension/deviceBind.js @@ -52,16 +52,16 @@ class DeviceBind extends BaseExtension { logger.info( `Successfully ${type === 'bind' ? 'bound' : 'unbound'} cluster '${cluster}' from ` + - `'${sourceName}' to '${targetName}'` + `'${sourceName}' to '${targetName}'`, ); this.mqtt.log( `device_${type}`, - {from: sourceName, to: targetName, cluster} + {from: sourceName, to: targetName, cluster}, ); } catch (error) { logger.error( `Failed to ${type} cluster '${cluster}' from '${sourceName}' to ` + - `'${targetName}' (${error})` + `'${targetName}' (${error})`, ); } } diff --git a/lib/extension/deviceConfigure.js b/lib/extension/deviceConfigure.js index 31cdd8bcd..5fd1f5345 100644 --- a/lib/extension/deviceConfigure.js +++ b/lib/extension/deviceConfigure.js @@ -71,7 +71,7 @@ class DeviceConfigure extends BaseExtension { } catch (error) { logger.error( `Failed to configure '${settingsDevice.friendlyName}', ` + - `attempt ${this.attempts[device.ieeeAddr] + 1} (${error.stack})` + `attempt ${this.attempts[device.ieeeAddr] + 1} (${error.stack})`, ); this.attempts[device.ieeeAddr]++; } diff --git a/lib/extension/deviceGroupMembership.js b/lib/extension/deviceGroupMembership.js index a4e778129..71a4aae05 100644 --- a/lib/extension/deviceGroupMembership.js +++ b/lib/extension/deviceGroupMembership.js @@ -23,7 +23,7 @@ class DeviceGroupMembership extends BaseExtension { } const response = await entity.endpoint.command( - `genGroups`, 'getMembership', {groupcount: 0, grouplist: []}, {}, true + `genGroups`, 'getMembership', {groupcount: 0, grouplist: []}, {}, true, ); const {grouplist, capacity} = response; diff --git a/lib/extension/deviceReceive.js b/lib/extension/deviceReceive.js index 69e695dc7..d52b576a0 100644 --- a/lib/extension/deviceReceive.js +++ b/lib/extension/deviceReceive.js @@ -90,7 +90,7 @@ class DeviceReceive extends BaseExtension { const level = ['readResponse', 'raw'].includes(data.type) ? 'debug' : 'warn'; logger[level]( `No converter available for '${mappedDevice.model}' with cluster '${data.cluster}' ` + - `and type '${data.type}' and data '${JSON.stringify(data.data)}'` + `and type '${data.type}' and data '${JSON.stringify(data.data)}'`, ); logger[level](`Please see: https://www.zigbee2mqtt.io/how_tos/how_to_support_new_devices.html.`); return; diff --git a/lib/extension/deviceReport.js b/lib/extension/deviceReport.js index 040903ca4..897f058ca 100644 --- a/lib/extension/deviceReport.js +++ b/lib/extension/deviceReport.js @@ -76,7 +76,7 @@ class DeviceReport extends BaseExtension { await endpoint.bind(cluster, this.coordinatorEndpoint); await endpoint.configureReporting(cluster, configuration); logger.info( - `Succesfully setup reporting for '${device.ieeeAddr}' - ${endpoint.ID} - ${cluster}` + `Succesfully setup reporting for '${device.ieeeAddr}' - ${endpoint.ID} - ${cluster}`, ); } } @@ -86,7 +86,7 @@ class DeviceReport extends BaseExtension { device.meta.reporting = reportKey; } catch (error) { logger.error( - `Failed to setup reporting for '${device.ieeeAddr}' - ${error.stack}` + `Failed to setup reporting for '${device.ieeeAddr}' - ${error.stack}`, ); this.failed.add(device.ieeeAddr); @@ -145,7 +145,7 @@ class DeviceReport extends BaseExtension { */ const polls = pollOnMessage.filter((p) => p.cluster[message.cluster] && p.cluster[message.cluster].find((c) => c.type === message.type && - utils.equalsPartial(message.data, c.data)) + utils.equalsPartial(message.data, c.data)), ); if (polls.length) { diff --git a/lib/extension/networkMap.js b/lib/extension/networkMap.js index 6c6c6be8d..cd8de63b5 100644 --- a/lib/extension/networkMap.js +++ b/lib/extension/networkMap.js @@ -56,7 +56,7 @@ class NetworkMap extends BaseExtension { // Add the device short network address, ieeaddr and scan note (if any) labels.push( `${device.ieeeAddr} (${device.networkAddress})` + - ((device.failed && device.failed.length) ? `failed: ${device.failed.join(',')}` : '') + ((device.failed && device.failed.length) ? `failed: ${device.failed.join(',')}` : ''), ); // Add the device model diff --git a/lib/zigbee.js b/lib/zigbee.js index c4fe1e235..04d5e7dad 100644 --- a/lib/zigbee.js +++ b/lib/zigbee.js @@ -122,7 +122,7 @@ class Zigbee extends events.EventEmitter { resolveEntity(key) { assert( typeof key === 'string' || typeof key === 'number' || - key.constructor.name === 'Device', `Wrong type '${typeof key}'` + key.constructor.name === 'Device', `Wrong type '${typeof key}'`, ); if (typeof key === 'string' || typeof key === 'number') {